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

avcodec/mpegvideo_parser: consider vbv_delay in bitrate heuristic also for mpeg2 

Fixes bitrate detection in CBR mpeg2
Fixes ticket3678
This commit is contained in:
Michael Niedermayer 2014-08-20 20:01:40 +02:00
parent 08a110ca87
commit d647ef0c80
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpegvideo_parser.c
View File

@ -145,8 +145,9 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
the_end: ; the_end: ;
if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && bit_rate) { if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && bit_rate) {
avctx->rc_max_rate = 400*bit_rate; avctx->rc_max_rate = 400*bit_rate;
} else if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && bit_rate && }
(bit_rate != 0x3FFFF || vbv_delay != 0xFFFF)) { if (bit_rate &&
((avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && bit_rate != 0x3FFFF) || vbv_delay != 0xFFFF)) {
avctx->bit_rate = 400*bit_rate; avctx->bit_rate = 400*bit_rate;
} }
} }