From 0cd55b0c18934adc2afb6f7249105c3f6adc2d12 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 13 Dec 2009 22:12:20 +0000 Subject: [PATCH] Add CODEC_ID_DNXHD into the 25 fps case. Merged from ffmbc. Originally committed as revision 20841 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/raw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/raw.c b/libavformat/raw.c index 83cc131..f4d7bb1 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -282,6 +282,7 @@ static int video_read_header(AVFormatContext *s, } else if ( st->codec->codec_id == CODEC_ID_MJPEG || st->codec->codec_id == CODEC_ID_MPEG4 || st->codec->codec_id == CODEC_ID_DIRAC || + st->codec->codec_id == CODEC_ID_DNXHD || st->codec->codec_id == CODEC_ID_H264) { st->codec->time_base= (AVRational){1,25}; } -- 2.7.4