mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-06-30 21:08:59 +08:00
Add CODEC_ID_DNXHD into the 25 fps case.
Merged from ffmbc. Originally committed as revision 20841 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@ -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};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user