From 1607a985455287ccae3bfa46393a6cdfc04ce64f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 3 Aug 2013 10:27:42 +0200 Subject: [PATCH] avcodec/mlp: Fix bugs in libavs warning fixes Signed-off-by: Michael Niedermayer --- libavcodec/mlp_parser.c | 4 ++-- libavcodec/mlpdec.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 69a175a07c..fcd1168076 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -337,8 +337,8 @@ FF_DISABLE_DEPRECATION_WARNINGS mh.num_substreams > 1) { avctx->channels = 2; avctx->channel_layout = AV_CH_LAYOUT_STEREO; - } else FF_ENABLE_DEPRECATION_WARNINGS + } else #endif if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO && mh.num_substreams > 1) { @@ -360,8 +360,8 @@ FF_DISABLE_DEPRECATION_WARNINGS avctx->request_channels <= mh.channels_thd_stream1) { avctx->channels = mh.channels_thd_stream1; avctx->channel_layout = mh.channel_layout_thd_stream1; - } else FF_ENABLE_DEPRECATION_WARNINGS + } else #endif if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO && mh.num_substreams > 1) { diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 1722de6131..059e4d0f74 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -471,8 +471,8 @@ FF_DISABLE_DEPRECATION_WARNINGS "Further substreams will be skipped.\n", s->max_channel + 1, substr); m->max_decoded_substream = substr; - } else FF_ENABLE_DEPRECATION_WARNINGS + } else #endif if (m->avctx->request_channel_layout == s->ch_layout && m->max_decoded_substream > substr) {