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/g722.c | |
| parent | 09f47fa44ebf3f18651397517b49e6f8c5a0e374 (diff) | |
| download | ffmpeg-streaming-5d6e4c160a4a0d71c17e8428123027c747ff0fb3.zip ffmpeg-streaming-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/g722.c')
| -rw-r--r-- | libavcodec/g722.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/g722.c b/libavcodec/g722.c index 51a0f39..6b09424 100644 --- a/libavcodec/g722.c +++ b/libavcodec/g722.c @@ -193,7 +193,7 @@ static av_cold int g722_init(AVCodecContext * avctx) av_log(avctx, AV_LOG_ERROR, "Only mono tracks are allowed.\n"); return AVERROR_INVALIDDATA; } - avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; switch (avctx->bits_per_coded_sample) { case 8: @@ -379,7 +379,7 @@ AVCodec adpcm_g722_encoder = { .init = g722_init, .encode = g722_encode_frame, .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), - .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, + .sample_fmts = (enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, }; #endif |
