Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/eacmv.c
index b3ffb3f,1a4e16e..8abc0a6
--- 1/libavcodec/eacmv.c
--- 2/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@@ -141,16 -140,14 +141,17 @@@ static int cmv_process_header(CmvContex
  
      s->width  = AV_RL16(&buf[4]);
      s->height = AV_RL16(&buf[6]);
 -
 -    ret = ff_set_dimensions(s->avctx, s->width, s->height);
 -    if (ret < 0)
 -        return ret;
 +    if (s->avctx->width!=s->width || s->avctx->height!=s->height) {
 +        av_frame_unref(s->last_frame);
 +        av_frame_unref(s->last2_frame);
 +        ret = ff_set_dimensions(s->avctx, s->width, s->height);
 +        if (ret < 0)
 +            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]);