mirror of https://git.ffmpeg.org/ffmpeg.git
lavc: replace rest of deprecated SAMPLE_FMT_* with AV_SAMPLE_FMT_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
7099f36578
commit
69d766daa0
|
@ -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
|
||||
|
|
|
@ -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)"),
|
||||
};
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue