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/aacdectab.h | |
| 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/aacdectab.h')
| -rw-r--r-- | libavcodec/aacdectab.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index b74f100112..b4307f133c 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -30,6 +30,7 @@ #ifndef AVCODEC_AACDECTAB_H #define AVCODEC_AACDECTAB_H +#include "libavcore/audioconvert.h" #include "aac.h" #include <stdint.h> @@ -82,13 +83,13 @@ static const uint8_t aac_channel_layout_map[7][5][2] = { }; static const int64_t aac_channel_layout[8] = { - CH_LAYOUT_MONO, - CH_LAYOUT_STEREO, - CH_LAYOUT_SURROUND, - CH_LAYOUT_4POINT0, - CH_LAYOUT_5POINT0_BACK, - CH_LAYOUT_5POINT1_BACK, - CH_LAYOUT_7POINT1_WIDE, + AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_SURROUND, + AV_CH_LAYOUT_4POINT0, + AV_CH_LAYOUT_5POINT0_BACK, + AV_CH_LAYOUT_5POINT1_BACK, + AV_CH_LAYOUT_7POINT1_WIDE, 0, }; |