diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-12-13 22:12:20 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-12-13 22:12:20 +0000 |
| commit | 0cd55b0c18934adc2afb6f7249105c3f6adc2d12 (patch) | |
| tree | 45cd5653c1c44a48dd2b983084252bcec75ba619 /libavformat/raw.c | |
| parent | da457e7086d7889231def45d699ce8f101f29060 (diff) | |
| download | ffmpeg-streaming-0cd55b0c18934adc2afb6f7249105c3f6adc2d12.zip ffmpeg-streaming-0cd55b0c18934adc2afb6f7249105c3f6adc2d12.tar.gz | |
Add CODEC_ID_DNXHD into the 25 fps case.
Merged from ffmbc.
Originally committed as revision 20841 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/raw.c')
| -rw-r--r-- | libavformat/raw.c | 1 |
1 files changed, 1 insertions, 0 deletions
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}; } |
