[FFmpeg-cvslog] Revert "Fix channel layout for some stereo flac files."

Michael Niedermayer git at videolan.org
Fri Feb 24 04:35:06 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 24 04:21:16 2012 +0100| [003e024bfbf699489ee040fec45476f036cc9947] | committer: Michael Niedermayer

Revert "Fix channel layout for some stereo flac files."

This reverts commit d2ee3c913d6fec3cb8c0c1b67347007c7cd604e1.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=003e024bfbf699489ee040fec45476f036cc9947
---

 libavcodec/flac.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 5ed3ef7..6e94c2c 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);



More information about the ffmpeg-cvslog mailing list