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/tta.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/tta.c')
| -rw-r--r-- | libavcodec/tta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 81217f57d2..dad9933b0e 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -246,15 +246,15 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) if (s->is_float) { - avctx->sample_fmt = SAMPLE_FMT_FLT; + avctx->sample_fmt = AV_SAMPLE_FMT_FLT; av_log(s->avctx, AV_LOG_ERROR, "Unsupported sample format. Please contact the developers.\n"); return -1; } else switch(s->bps) { -// case 1: avctx->sample_fmt = SAMPLE_FMT_U8; break; - case 2: avctx->sample_fmt = SAMPLE_FMT_S16; break; -// case 3: avctx->sample_fmt = SAMPLE_FMT_S24; break; - case 4: avctx->sample_fmt = SAMPLE_FMT_S32; break; +// case 1: avctx->sample_fmt = AV_SAMPLE_FMT_U8; break; + case 2: avctx->sample_fmt = AV_SAMPLE_FMT_S16; break; +// case 3: avctx->sample_fmt = AV_SAMPLE_FMT_S24; break; + case 4: avctx->sample_fmt = AV_SAMPLE_FMT_S32; break; default: av_log(s->avctx, AV_LOG_ERROR, "Invalid/unsupported sample format. Please contact the developers.\n"); return -1; |