From 2a672652bb70fe6ae1c711f80678f9a513732ee1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 25 Sep 2012 22:35:26 +0200 Subject: mlp_parser: dont override existing channel geometry. This prevents race conditions And partly fixes Ticket1726 Signed-off-by: Michael Niedermayer --- libavcodec/mlp_parser.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavcodec/mlp_parser.c') diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 7c0630caac..5fb1424b46 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -317,6 +317,7 @@ static int mlp_parse(AVCodecParserContext *s, avctx->sample_rate = mh.group1_samplerate; s->duration = mh.access_unit_size; + if(!avctx->channels || !avctx->channel_layout) { if (mh.stream_type == 0xbb) { /* MLP stream */ avctx->channels = mlp_channels[mh.channels_mlp]; @@ -331,6 +332,7 @@ static int mlp_parse(AVCodecParserContext *s, avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1); } } + } if (!mh.is_vbr) /* Stream is CBR */ avctx->bit_rate = mh.peak_bitrate; -- cgit v1.2.3