summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-30 21:19:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-30 21:19:23 +0100
commit77af2672b4c40012ca7e3f0b2b969b50408a9ade (patch)
tree43ce60be98b9a08871c6b57cacf7618938661fe9 /libavcodec
parent11828b8885cc1d87ffc7b1b4bbe642ce9720b194 (diff)
lavc: Fix side data handling for audio decoders.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a601ec8920..f023a8967c 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");