Commit f8ba7c46 authored by Paul B Mahol's avatar Paul B Mahol Committed by Michael Niedermayer

adxenc: fix error in merging from qatar

Pointed out by FATE.
Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7ed9abf7
...@@ -118,9 +118,8 @@ static av_cold int adx_encode_init(AVCodecContext *avctx) ...@@ -118,9 +118,8 @@ static av_cold int adx_encode_init(AVCodecContext *avctx)
avctx->frame_size = BLOCK_SAMPLES; avctx->frame_size = BLOCK_SAMPLES;
#if FF_API_OLD_ENCODE_AUDIO #if FF_API_OLD_ENCODE_AUDIO
avctx->coded_frame = avcodec_alloc_frame(); avcodec_get_frame_defaults(&c->frame);
if (!avctx->coded_frame) avctx->coded_frame = &c->frame;
return AVERROR(ENOMEM);
#endif #endif
/* the cutoff can be adjusted, but this seems to work pretty well */ /* the cutoff can be adjusted, but this seems to work pretty well */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment