aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-28 19:41:18 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-28 19:41:18 +0000
commitf056c8e9ddc97266d18ae4b88d7ffe576115af82 (patch)
tree4287d1d3853d45b55177e4afd425f3a6fd569db5
parent74fd9022b547accbccb07931f209df5385992e4d (diff)
downloadffmpeg-f056c8e9ddc97266d18ae4b88d7ffe576115af82.tar.gz
set frame_size in libfaad decoder
Originally committed as revision 14024 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/libfaad.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c
index dc66788830..bb901f9675 100644
--- a/libavcodec/libfaad.c
+++ b/libavcodec/libfaad.c
@@ -196,7 +196,8 @@ static int faac_decode_frame(AVCodecContext *avctx,
s->faacDecGetErrorMessage(frame_info.error));
return -1;
}
-
+ if (!avctx->frame_size)
+ avctx->frame_size = frame_info.samples/avctx->channels;
frame_info.samples *= s->sample_size;
memcpy(data, out, frame_info.samples); // CHECKME - can we cheat this one