aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-24 04:21:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-24 04:21:16 +0100
commit003e024bfbf699489ee040fec45476f036cc9947 (patch)
treee79563b3e3876c31f5ea8dbc9c80813b4c65377e
parent3be7917894a9da50c11f61ae7b49855435096883 (diff)
downloadffmpeg-003e024bfbf699489ee040fec45476f036cc9947.tar.gz
Revert "Fix channel layout for some stereo flac files."
This reverts commit d2ee3c913d6fec3cb8c0c1b67347007c7cd604e1.
-rw-r--r--libavcodec/flac.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 5ed3ef7fc3..6e94c2c5ff 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -60,7 +60,6 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
fi->ch_mode = FLAC_CHMODE_INDEPENDENT;
} else if (fi->ch_mode <= FLAC_CHMODE_MID_SIDE) {
fi->channels = 2;
- avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else {
av_log(avctx, AV_LOG_ERROR + log_level_offset,
"invalid channel mode: %d\n", fi->ch_mode);