# HG changeset patch # User michael # Date 1260742340 0 # Node ID c0f40f4293cdde276af6af527a71cc0cd0d30037 # Parent daea7c5405acdfaa0e7fe658bc1a3f3cc1218182 Add CODEC_ID_DNXHD into the 25 fps case. Merged from ffmbc. diff -r daea7c5405ac -r c0f40f4293cd raw.c --- a/raw.c Sun Dec 13 21:07:47 2009 +0000 +++ b/raw.c Sun Dec 13 22:12:20 2009 +0000 @@ -282,6 +282,7 @@ } 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}; }