Commit ef0cdf1b authored by michael's avatar michael

Add CODEC_ID_DNXHD into the 25 fps case.

Merged from ffmbc.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20841 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e563bb6e
...@@ -282,6 +282,7 @@ static int video_read_header(AVFormatContext *s, ...@@ -282,6 +282,7 @@ static int video_read_header(AVFormatContext *s,
} else if ( st->codec->codec_id == CODEC_ID_MJPEG || } else if ( st->codec->codec_id == CODEC_ID_MJPEG ||
st->codec->codec_id == CODEC_ID_MPEG4 || st->codec->codec_id == CODEC_ID_MPEG4 ||
st->codec->codec_id == CODEC_ID_DIRAC || st->codec->codec_id == CODEC_ID_DIRAC ||
st->codec->codec_id == CODEC_ID_DNXHD ||
st->codec->codec_id == CODEC_ID_H264) { st->codec->codec_id == CODEC_ID_H264) {
st->codec->time_base= (AVRational){1,25}; st->codec->time_base= (AVRational){1,25};
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment