[FFmpeg-cvslog] lavc: replace rest of deprecated SAMPLE_FMT_* with AV_SAMPLE_FMT_*
Paul B Mahol
git at videolan.org
Tue Jan 3 06:31:19 CET 2012
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Jan 3 02:45:05 2012 +0000| [69d766daa0fdb85410bcb926d2b9ace0aaba34d0] | committer: Michael Niedermayer
lavc: replace rest of deprecated SAMPLE_FMT_* with AV_SAMPLE_FMT_*
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69d766daa0fdb85410bcb926d2b9ace0aaba34d0
---
libavcodec/g723_1.c | 6 +++---
libavcodec/libaacplus.c | 2 +-
libavcodec/nellymoserdec.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index 6b84161..9a1e294 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1.c
@@ -77,7 +77,7 @@ static av_cold int g723_1_decode_init(AVCodecContext *avctx)
{
G723_1_Context *p = avctx->priv_data;
- avctx->sample_fmt = SAMPLE_FMT_S16;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
p->pf_gain = 1 << 12;
memcpy(p->prev_lsp, dc_lsp, LPC_ORDER * sizeof(int16_t));
@@ -2224,7 +2224,7 @@ AVCodec ff_g723_1_encoder = {
.init = g723_1_encode_init,
.encode = g723_1_encode_frame,
.long_name = NULL_IF_CONFIG_SMALL("G.723.1"),
- .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,
- SAMPLE_FMT_NONE},
+ .sample_fmts = (const enum SampleFormat[]){AV_SAMPLE_FMT_S16,
+ AV_SAMPLE_FMT_NONE},
};
#endif
diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c
index 3ab4e03..75b792d 100644
--- a/libavcodec/libaacplus.c
+++ b/libavcodec/libaacplus.c
@@ -129,6 +129,6 @@ AVCodec ff_libaacplus_encoder = {
.init = aacPlus_encode_init,
.encode = aacPlus_encode_frame,
.close = aacPlus_encode_close,
- .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+ .sample_fmts = (const enum SampleFormat[]){AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"),
};
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 9e39097..2a1ec5b 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -192,7 +192,7 @@ static int decode_tag(AVCodecContext *avctx, void *data,
samples_flt = (float *)s->frame.data[0];
for (i=0 ; i<blocks ; i++) {
- if (avctx->sample_fmt == SAMPLE_FMT_FLT) {
+ if (avctx->sample_fmt == AV_SAMPLE_FMT_FLT) {
nelly_decode_block(s, buf, samples_flt);
samples_flt += NELLY_SAMPLES;
} else {
More information about the ffmpeg-cvslog
mailing list