From f8ba7c46587d3c690d5491dc9fdfe20a4faad902 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Sat, 24 Mar 2012 15:28:51 +0000
Subject: [PATCH] adxenc: fix error in merging from qatar

Pointed out by FATE.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavcodec/adxenc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index ca472e0f9d..bcb8967266 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -118,9 +118,8 @@ static av_cold int adx_encode_init(AVCodecContext *avctx)
     avctx->frame_size = BLOCK_SAMPLES;
 
 #if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame = avcodec_alloc_frame();
-    if (!avctx->coded_frame)
-        return AVERROR(ENOMEM);
+    avcodec_get_frame_defaults(&c->frame);
+    avctx->coded_frame = &c->frame;
 #endif
 
     /* the cutoff can be adjusted, but this seems to work pretty well */