generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'

Browse Source 
* commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c':
  eacmv: check the framerate before setting it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-04 01:05:52 +01:00
commit 405b1ef898
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/eacmv.c
View File

@ -132,7 +132,7 @@ static void cmv_decode_inter(CmvContext *s, AVFrame *frame, const uint8_t *buf,
static int cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t *buf_end) static int cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t *buf_end)
{ {
int pal_start, pal_count, i, ret; int pal_start, pal_count, i, ret, fps;
if(buf_end - buf < 16) { if(buf_end - buf < 16) {
av_log(s->avctx, AV_LOG_WARNING, "truncated header\n"); av_log(s->avctx, AV_LOG_WARNING, "truncated header\n");
@ -149,8 +149,9 @@ static int cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t *
return ret; return ret;
} }
s->avctx->time_base.num = 1; fps = AV_RL16(&buf[10]);
s->avctx->time_base.den = AV_RL16(&buf[10]); if (fps > 0)
s->avctx->time_base = (AVRational){ 1, fps };
pal_start = AV_RL16(&buf[12]); pal_start = AV_RL16(&buf[12]);
pal_count = AV_RL16(&buf[14]); pal_count = AV_RL16(&buf[14]);