aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/eacmv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-04 01:05:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-04 01:07:05 +0100
commit405b1ef898bf9ee509d2642bdf5bad05d9faa1ce (patch)
tree9c268febb39b89c1ffa1ad55e835c97189446d5a /libavcodec/eacmv.c
parentc13e73c25b6d548c6982cfe267b3925dad4f253e (diff)
parent24057c83207d6ea8bfd824155ac37be8a33dfd0c (diff)
downloadffmpeg-405b1ef898bf9ee509d2642bdf5bad05d9faa1ce.tar.gz
Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'
* commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c': eacmv: check the framerate before setting it. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eacmv.c')
-rw-r--r--libavcodec/eacmv.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index b3ffb3f07b..8abc0a6147 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -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)
{
- int pal_start, pal_count, i, ret;
+ int pal_start, pal_count, i, ret, fps;
if(buf_end - buf < 16) {
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;
}
- s->avctx->time_base.num = 1;
- s->avctx->time_base.den = AV_RL16(&buf[10]);
+ fps = AV_RL16(&buf[10]);
+ if (fps > 0)
+ s->avctx->time_base = (AVRational){ 1, fps };
pal_start = AV_RL16(&buf[12]);
pal_count = AV_RL16(&buf[14]);