aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g723_1.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-01-03 02:45:05 +0000
committerMichael Niedermayer <michaelni@gmx.at>2012-01-03 04:00:52 +0100
commit69d766daa0fdb85410bcb926d2b9ace0aaba34d0 (patch)
tree2097893214537bbfe3ac4534e41a0f5b23f58f96 /libavcodec/g723_1.c
parent7099f36578252935157be322bc9a34d0c861f83e (diff)
downloadffmpeg-69d766daa0fdb85410bcb926d2b9ace0aaba34d0.tar.gz
lavc: replace rest of deprecated SAMPLE_FMT_* with AV_SAMPLE_FMT_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1.c')
-rw-r--r--libavcodec/g723_1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index 6b84161f19..9a1e294722 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