[FFmpeg-cvslog] lavc: Fix side data handling for audio decoders.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 30 21:19:23 2011 +0100| [77af2672b4c40012ca7e3f0b2b969b50408a9ade] | committer: Michael Niedermayer

lavc: Fix side data handling for audio decoders.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77af2672b4c40012ca7e3f0b2b969b50408a9ade
---

 libavcodec/utils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a601ec8..f023a89 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -868,14 +868,14 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
 {
     int ret;
 
-    avctx->pkt = avpkt;
-
     if (!avpkt->data && avpkt->size) {
         av_log(avctx, AV_LOG_ERROR, "invalid packet: NULL data, size != 0\n");
         return AVERROR(EINVAL);
     }
 
     if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){
+        av_packet_split_side_data(avpkt);
+        avctx->pkt = avpkt;
         //FIXME remove the check below _after_ ensuring that all audio check that the available space is enough
         if(*frame_size_ptr < AVCODEC_MAX_AUDIO_FRAME_SIZE){
             av_log(avctx, AV_LOG_ERROR, "buffer smaller than AVCODEC_MAX_AUDIO_FRAME_SIZE\n");