virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'

Browse Source 
* commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091':
  txd: do not set the codec timebase.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-22 13:30:20 +02:00
parent 57fb570908 a4ed995cab
commit 57123dc67e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/txd.c
View File

@@ -21,6 +21,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#define TXD_FILE 0x16 #define TXD_FILE 0x16
#define TXD_INFO 0x01 #define TXD_INFO 0x01
@@ -45,8 +46,8 @@ static int txd_read_header(AVFormatContext *s) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = AV_CODEC_ID_TXD; st->codec->codec_id = AV_CODEC_ID_TXD;
st->codec->time_base.den = 5; avpriv_set_pts_info(st, 64, 1, 5);
st->codec->time_base.num = 1; st->avg_frame_rate = av_inv_q(st->time_base);
/* the parameters will be extracted from the compressed bitstream */ /* the parameters will be extracted from the compressed bitstream */
return 0; return 0;