diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-21 20:06:22 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-21 20:06:22 +0000 |
| commit | 63e8d9760f23a4edf81e9ae58c4f6d3baa6ff4dd (patch) | |
| tree | c2a7e585f116b18204d49b0a779d2549485518a0 /libavcodec/ac3tab.c | |
| parent | d6e602536c049a952969e95bb8f3897f5d46b914 (diff) | |
| download | ffmpeg-63e8d9760f23a4edf81e9ae58c4f6d3baa6ff4dd.tar.gz | |
Use the new libavcore audio channel API.
This also allows to remove a linking dependency of libavfilter on
libavcodec.
Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3tab.c')
| -rw-r--r-- | libavcodec/ac3tab.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index 76f6245ba0..2a90f4ace5 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -24,6 +24,7 @@ * tables taken directly from the AC-3 spec. */ +#include "libavcore/audioconvert.h" #include "avcodec.h" #include "ac3tab.h" @@ -84,14 +85,14 @@ const uint8_t ff_ac3_channels_tab[8] = { * Map audio coding mode (acmod) to channel layout mask. */ const uint16_t ff_ac3_channel_layout_tab[8] = { - CH_LAYOUT_STEREO, - CH_LAYOUT_MONO, - CH_LAYOUT_STEREO, - CH_LAYOUT_SURROUND, - CH_LAYOUT_2_1, - CH_LAYOUT_4POINT0, - CH_LAYOUT_2_2, - CH_LAYOUT_5POINT0 + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_SURROUND, + AV_CH_LAYOUT_2_1, + AV_CH_LAYOUT_4POINT0, + AV_CH_LAYOUT_2_2, + AV_CH_LAYOUT_5POINT0 }; #define COMMON_CHANNEL_MAP \ |