diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-12 11:04:40 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-12 11:04:40 +0000 |
| commit | 5d6e4c160a4a0d71c17e8428123027c747ff0fb3 (patch) | |
| tree | d3132b2b615fe19f3f4b5ad43b095c076320c780 /libavcodec/libgsm.c | |
| parent | 09f47fa44ebf3f18651397517b49e6f8c5a0e374 (diff) | |
| download | ffmpeg-5d6e4c160a4a0d71c17e8428123027c747ff0fb3.tar.gz | |
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/libgsm.c')
| -rw-r--r-- | libavcodec/libgsm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index a7bc68ad71..77cc8914cc 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -49,7 +49,7 @@ static av_cold int libgsm_init(AVCodecContext *avctx) { if(!avctx->sample_rate) avctx->sample_rate= 8000; - avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; }else{ if (avctx->sample_rate != 8000) { av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n", @@ -120,7 +120,7 @@ AVCodec libgsm_encoder = { libgsm_init, libgsm_encode_frame, libgsm_close, - .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("libgsm GSM"), }; @@ -132,7 +132,7 @@ AVCodec libgsm_ms_encoder = { libgsm_init, libgsm_encode_frame, libgsm_close, - .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("libgsm GSM Microsoft variant"), }; |