Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:53:41 +0000 (14:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:53:41 +0000 (14:53 +0200)
* commit '79f2c426fde6e71c40b29504112d0528b85be623':
  dv: do not set codec timebase

Conflicts:
libavformat/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/dv.c

@@@ -288,7 -277,12 +288,7 @@@ static int dv_extract_video_info(DVDemu
  
          avpriv_set_pts_info(c->vst, 64, c->sys->time_base.num,
                              c->sys->time_base.den);
-         avctx->time_base = c->sys->time_base;
+         c->vst->avg_frame_rate = av_inv_q(c->vst->time_base);
 -        if (!avctx->width) {
 -            avctx->width  = c->sys->width;
 -            avctx->height = c->sys->height;
 -        }
 -        avctx->pix_fmt = c->sys->pix_fmt;
  
          /* finding out SAR is a little bit messy */
          vsc_pack = dv_extract_pack(frame, dv_video_control);