Mercurial > libavformat.hg

comparison raw.c @ 5451:c0f40f4293cd libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add CODEC_ID_DNXHD into the 25 fps case. Merged from ffmbc.
author michael
date Sun, 13 Dec 2009 22:12:20 +0000
parents 9ee7e675a476
children 408c4e4d278a
comparison
equal deleted inserted replaced
5450:daea7c5405ac 5451:c0f40f4293cd
280 if (ap->time_base.num) { 280 if (ap->time_base.num) {
281 st->codec->time_base= ap->time_base; 281 st->codec->time_base= ap->time_base;
282 } else if ( st->codec->codec_id == CODEC_ID_MJPEG || 282 } else if ( st->codec->codec_id == CODEC_ID_MJPEG ||
283 st->codec->codec_id == CODEC_ID_MPEG4 || 283 st->codec->codec_id == CODEC_ID_MPEG4 ||
284 st->codec->codec_id == CODEC_ID_DIRAC || 284 st->codec->codec_id == CODEC_ID_DIRAC ||
285 st->codec->codec_id == CODEC_ID_DNXHD ||
285 st->codec->codec_id == CODEC_ID_H264) { 286 st->codec->codec_id == CODEC_ID_H264) {
286 st->codec->time_base= (AVRational){1,25}; 287 st->codec->time_base= (AVRational){1,25};
287 } 288 }
288 av_set_pts_info(st, 64, 1, 1200000); 289 av_set_pts_info(st, 64, 1, 1200000);
289 290