RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2009-12-13 22:12:20 +00:00
parent da457e7086
commit 0cd55b0c18
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/raw.c
View File

@ -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};
} }