Commit 77af2672 authored by Michael Niedermayer's avatar Michael Niedermayer

lavc: Fix side data handling for audio decoders.

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 11828b88
...@@ -868,14 +868,14 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa ...@@ -868,14 +868,14 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
{ {
int ret; int ret;
avctx->pkt = avpkt;
if (!avpkt->data && avpkt->size) { if (!avpkt->data && avpkt->size) {
av_log(avctx, AV_LOG_ERROR, "invalid packet: NULL data, size != 0\n"); av_log(avctx, AV_LOG_ERROR, "invalid packet: NULL data, size != 0\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ 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 //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){ if(*frame_size_ptr < AVCODEC_MAX_AUDIO_FRAME_SIZE){
av_log(avctx, AV_LOG_ERROR, "buffer smaller than AVCODEC_MAX_AUDIO_FRAME_SIZE\n"); av_log(avctx, AV_LOG_ERROR, "buffer smaller than AVCODEC_MAX_AUDIO_FRAME_SIZE\n");
......
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