Fixes bitrate detection in CBR mpeg2
Fixes ticket3678
---
libavcodec/mpegvideo_parser.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c
index 7aa3660..44bf26d 100644
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -145,8 +145,9 @@ static void mpegvideo_extract_headers(AVCodecParserContext
*s,
the_end: ;
if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && 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;
}
}
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel