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/flacdec.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/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 2d4dac0616..8488a9d090 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -113,7 +113,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) FLACContext *s = avctx->priv_data; s->avctx = avctx; - avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; /* for now, the raw FLAC header is allowed to be passed to the decoder as frame data instead of extradata. */ @@ -126,9 +126,9 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) /* initialize based on the demuxer-supplied streamdata header */ ff_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo); if (s->bps > 16) - avctx->sample_fmt = SAMPLE_FMT_S32; + avctx->sample_fmt = AV_SAMPLE_FMT_S32; else - avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; allocate_buffers(s); s->got_streaminfo = 1; @@ -603,11 +603,11 @@ static int decode_frame(FLACContext *s) s->bps = s->avctx->bits_per_raw_sample = fi.bps; if (s->bps > 16) { - s->avctx->sample_fmt = SAMPLE_FMT_S32; + s->avctx->sample_fmt = AV_SAMPLE_FMT_S32; s->sample_shift = 32 - s->bps; s->is32 = 1; } else { - s->avctx->sample_fmt = SAMPLE_FMT_S16; + s->avctx->sample_fmt = AV_SAMPLE_FMT_S16; s->sample_shift = 16 - s->bps; s->is32 = 0; } |