summaryrefslogtreecommitdiffstats
path: root/libavcodec/mlpdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-23 16:50:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-23 16:50:52 +0100
commit0ff21c316534776f9b3ba5ae51242ae1a976909e (patch)
tree3ee7cbf370c3bb7c5144c87f595fd6bd8e25e9b1 /libavcodec/mlpdec.c
parent826188d27acdef6bf14edf018415e958f59ecfdd (diff)
downloadffmpeg-streaming-0ff21c316534776f9b3ba5ae51242ae1a976909e.zip
ffmpeg-streaming-0ff21c316534776f9b3ba5ae51242ae1a976909e.tar.gz
mlpdec: remove disabled code, leftover from merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdec.c')
-rw-r--r--libavcodec/mlpdec.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index d22a2bd..4532b37 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -361,32 +361,6 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
for (substr = 0; substr < MAX_SUBSTREAMS; substr++)
m->substream[substr].restart_seen = 0;
-#if 0
- if (mh.stream_type == 0xbb) {
- /* MLP stream */
- m->avctx->channel_layout = ff_mlp_layout[mh.channels_mlp];
- } else { /* mh.stream_type == 0xba */
- /* TrueHD stream */
- if (mh.channels_thd_stream2) {
- m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream2);
- } else {
- m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1);
- }
- if (m->avctx->channels<=2 && m->avctx->channel_layout == AV_CH_LAYOUT_MONO && m->max_decoded_substream == 1) {
- av_log(m->avctx, AV_LOG_DEBUG, "Mono stream with 2 substreams, ignoring 2nd\n");
- m->max_decoded_substream = 0;
- if (m->avctx->channels==2)
- m->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
- }
- if (m->avctx->channels &&
- !m->avctx->request_channels && !m->avctx->request_channel_layout &&
- av_get_channel_layout_nb_channels(m->avctx->channel_layout) != m->avctx->channels) {
- m->avctx->channel_layout = 0;
- av_log_ask_for_sample(m->avctx, "Unknown channel layout.");
- }
- }
-
-#else
/* Set the layout for each substream. When there's more than one, the first
* substream is Stereo. Subsequent substreams' layouts are indicated in the
* major sync. */
@@ -412,8 +386,6 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
}
}
-#endif
-
m->needs_reordering = mh.channels_mlp >= 18 && mh.channels_mlp <= 20;
return 0;
OpenPOWER on IntegriCloud