diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 13:30:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 13:30:23 +0200 |
| commit | 57123dc67e7768d31e394a9b97bb26831b63bc24 (patch) | |
| tree | 8cebe88825916986642c291db9af7b6dc72d3ed2 /libavformat | |
| parent | 57fb570908df2e84b11635f12b5be1fb27f053eb (diff) | |
| parent | a4ed995cabf220029f1d0e185a6fb45eed7b4091 (diff) | |
| download | ffmpeg-57123dc67e7768d31e394a9b97bb26831b63bc24.tar.gz | |
Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'
* commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091':
txd: do not set the codec timebase.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/txd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/txd.c b/libavformat/txd.c index 194945bbc8..400f2cc54b 100644 --- a/libavformat/txd.c +++ b/libavformat/txd.c @@ -21,6 +21,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" #define TXD_FILE 0x16 #define TXD_INFO 0x01 @@ -45,8 +46,8 @@ static int txd_read_header(AVFormatContext *s) { 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; |