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/audioconvert.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/audioconvert.c')
| -rw-r--r-- | libavcodec/audioconvert.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index 609fd1cef5..b29b030644 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -51,13 +51,13 @@ void avcodec_sample_fmt_string (char *buf, int buf_size, int sample_fmt) int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name) { switch(nb_channels) { - case 1: return CH_LAYOUT_MONO; - case 2: return CH_LAYOUT_STEREO; - case 3: return CH_LAYOUT_SURROUND; - case 4: return CH_LAYOUT_QUAD; - case 5: return CH_LAYOUT_5POINT0; - case 6: return CH_LAYOUT_5POINT1; - case 8: return CH_LAYOUT_7POINT1; + case 1: return AV_CH_LAYOUT_MONO; + case 2: return AV_CH_LAYOUT_STEREO; + case 3: return AV_CH_LAYOUT_SURROUND; + case 4: return AV_CH_LAYOUT_QUAD; + case 5: return AV_CH_LAYOUT_5POINT0; + case 6: return AV_CH_LAYOUT_5POINT1; + case 8: return AV_CH_LAYOUT_7POINT1; default: return 0; } } |