summaryrefslogtreecommitdiff
path: root/libavcodec/adpcm.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-11-12 11:04:40 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-11-12 11:04:40 +0000
commit5d6e4c160a4a0d71c17e8428123027c747ff0fb3 (patch)
treed3132b2b615fe19f3f4b5ad43b095c076320c780 /libavcodec/adpcm.c
parent09f47fa44ebf3f18651397517b49e6f8c5a0e374 (diff)
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/adpcm.c')
-rw-r--r--libavcodec/adpcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 455b477332..4825d41ed8 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -737,7 +737,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
default:
break;
}
- avctx->sample_fmt = SAMPLE_FMT_S16;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
return 0;
}
@@ -1678,7 +1678,7 @@ AVCodec name ## _encoder = { \
adpcm_encode_frame, \
adpcm_encode_close, \
NULL, \
- .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, \
+ .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
};
#else