diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-23 13:37:28 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-23 13:37:28 +0200 |
| commit | 2ef2496cd19eb833f4ad22a5051c11be80d09598 (patch) | |
| tree | 923e7925db6e22af38ff789be542aabfbc8622f1 | |
| parent | 539647c6ffa9c39f60cee41e1eb79e491bc4f4c5 (diff) | |
| download | ffmpeg-2ef2496cd19eb833f4ad22a5051c11be80d09598.tar.gz | |
Set channel layout in flac decoder.
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/flac.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 62ac8999a8..1561954a97 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -140,7 +140,7 @@ OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o rangecoder.o OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o rangecoder.o OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o -OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o +OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o vorbis_data.o OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 484a44efb3..6e94c2c5ff 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -22,6 +22,7 @@ #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 }; @@ -54,6 +55,8 @@ 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; |