aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libopencore-amr.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-08-05 11:11:04 +0200
committerAnton Khirnov <anton@khirnov.net>2012-08-07 16:00:24 +0200
commit36ef5369ee9b336febc2c270f8718cec4476cb85 (patch)
treed186adbb488e7f002aa894743b1ce0e8925520e6 /libavcodec/libopencore-amr.c
parent104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff)
downloadffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavcodec/libopencore-amr.c')
-rw-r--r--libavcodec/libopencore-amr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index 61bfcc0398..80b79f0184 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -27,7 +27,7 @@
static void amr_decode_fix_avctx(AVCodecContext *avctx)
{
- const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB);
+ const int is_amr_wb = 1 + (avctx->codec_id == AV_CODEC_ID_AMR_WB);
if (!avctx->sample_rate)
avctx->sample_rate = 8000 * is_amr_wb;
@@ -174,7 +174,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
AVCodec ff_libopencore_amrnb_decoder = {
.name = "libopencore_amrnb",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_AMR_NB,
+ .id = AV_CODEC_ID_AMR_NB,
.priv_data_size = sizeof(AMRContext),
.init = amr_nb_decode_init,
.close = amr_nb_decode_close,
@@ -291,7 +291,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
AVCodec ff_libopencore_amrnb_encoder = {
.name = "libopencore_amrnb",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_AMR_NB,
+ .id = AV_CODEC_ID_AMR_NB,
.priv_data_size = sizeof(AMRContext),
.init = amr_nb_encode_init,
.encode2 = amr_nb_encode_frame,
@@ -380,7 +380,7 @@ static int amr_wb_decode_close(AVCodecContext *avctx)
AVCodec ff_libopencore_amrwb_decoder = {
.name = "libopencore_amrwb",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_AMR_WB,
+ .id = AV_CODEC_ID_AMR_WB,
.priv_data_size = sizeof(AMRWBContext),
.init = amr_wb_decode_init,
.close = amr_wb_decode_close,