Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:30:20 +0000 (13:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:30:23 +0000 (13:30 +0200)
* commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091':
  txd: do not set the codec timebase.

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

@@@ -45,10 -46,9 +46,10 @@@ static int txd_read_header(AVFormatCont
          return AVERROR(ENOMEM);
      st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
      st->codec->codec_id = AV_CODEC_ID_TXD;
-     st->codec->time_base.den = 5;
-     st->codec->time_base.num = 1;
+     avpriv_set_pts_info(st, 64, 1, 5);
+     st->avg_frame_rate = av_inv_q(st->time_base);
      /* the parameters will be extracted from the compressed bitstream */
 +
      return 0;
  }