diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-24 04:22:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-24 04:22:20 +0100 |
| commit | 388b7ac07a214fea11b08ff683ee8c96ccc15f7e (patch) | |
| tree | 5fac24e0091af3ccd986b1a22352d365b8e72e48 /libavcodec | |
| parent | 003e024bfbf699489ee040fec45476f036cc9947 (diff) | |
| download | ffmpeg-388b7ac07a214fea11b08ff683ee8c96ccc15f7e.tar.gz | |
Revert "Set channel layout in flac decoder."
This reverts commit 2ef2496cd19eb833f4ad22a5051c11be80d09598.
Conflicts:
libavcodec/Makefile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/flac.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f46708368f..880e30b07e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -163,7 +163,7 @@ OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o rangecoder.o OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o OBJS-$(CONFIG_FFWAVESYNTH_DECODER) += ffwavesynth.o -OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o vorbis_data.o +OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o vorbis_data.o OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 6e94c2c5ff..484a44efb3 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -22,7 +22,6 @@ #include "libavutil/crc.h" #include "flac.h" #include "flacdata.h" -#include "vorbis.h" static const int8_t sample_size_table[] = { 0, 8, 12, 0, 16, 20, 24, 0 }; @@ -55,8 +54,6 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, fi->ch_mode = get_bits(gb, 4); if (fi->ch_mode < FLAC_MAX_CHANNELS) { fi->channels = fi->ch_mode + 1; - if (fi->ch_mode <= 5) - avctx->channel_layout = ff_vorbis_channel_layouts[fi->ch_mode]; fi->ch_mode = FLAC_CHMODE_INDEPENDENT; } else if (fi->ch_mode <= FLAC_CHMODE_MID_SIDE) { fi->channels = 2; |