diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 14:26:09 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-06 08:26:12 -0500 |
| commit | c2fcd0a7a4d0bda1a3306e40b70ce281a987df60 (patch) | |
| tree | 2f1d6751e938b53e2ae2734393079ef296666bbd /libavformat | |
| parent | ad3cffb68f9c77e140660a8ae7d43c8606208178 (diff) | |
| download | ffmpeg-c2fcd0a7a4d0bda1a3306e40b70ce281a987df60.tar.gz | |
Replace remaining occurrences of deprecated CH_* with AV_CH_*
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/aea.c | 3 | ||||
| -rw-r--r-- | libavformat/flic.c | 3 | ||||
| -rw-r--r-- | libavformat/wv.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/aea.c b/libavformat/aea.c index 6816506e4e..8a508ec50a 100644 --- a/libavformat/aea.c +++ b/libavformat/aea.c @@ -23,6 +23,7 @@ #include "avformat.h" #include "pcm.h" #include "libavutil/intreadwrite.h" +#include "libavcore/audioconvert.h" #define AT1_SU_SIZE 212 @@ -76,7 +77,7 @@ static int aea_read_header(AVFormatContext *s, return -1; } - st->codec->channel_layout = (st->codec->channels == 1) ? CH_LAYOUT_MONO : CH_LAYOUT_STEREO; + st->codec->channel_layout = (st->codec->channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; st->codec->block_align = AT1_SU_SIZE * st->codec->channels; return 0; diff --git a/libavformat/flic.c b/libavformat/flic.c index bf93c5c9b6..2e03c3b3a1 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -33,6 +33,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "libavcore/audioconvert.h" #define FLIC_FILE_MAGIC_1 0xAF11 #define FLIC_FILE_MAGIC_2 0xAF12 @@ -160,7 +161,7 @@ static int flic_read_header(AVFormatContext *s, ast->codec->sample_fmt = AV_SAMPLE_FMT_U8; ast->codec->bit_rate = st->codec->sample_rate * 8; ast->codec->bits_per_coded_sample = 8; - ast->codec->channel_layout = CH_LAYOUT_MONO; + ast->codec->channel_layout = AV_CH_LAYOUT_MONO; ast->codec->extradata_size = 0; /* Since the header information is incorrect we have to figure out the diff --git a/libavformat/wv.c b/libavformat/wv.c index 667ae2e6b6..182f900f36 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -23,6 +23,7 @@ #include "avformat.h" #include "apetag.h" #include "id3v1.h" +#include "libavcore/audioconvert.h" // specs say that maximum block size is 1Mb #define WV_BLOCK_LIMIT 1047576 @@ -111,7 +112,7 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb, int app //parse flags bpp = ((wc->flags & 3) + 1) << 3; chan = 1 + !(wc->flags & WV_MONO); - chmask = wc->flags & WV_MONO ? CH_LAYOUT_MONO : CH_LAYOUT_STEREO; + chmask = wc->flags & WV_MONO ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; rate = wv_rates[(wc->flags >> 23) & 0xF]; wc->multichannel = !!((wc->flags & WV_SINGLE_BLOCK) != WV_SINGLE_BLOCK); if(wc->multichannel){ |