[libav-devel] [PATCH 2/2] Make sure that audio packets with NULL data are not sent to the decoder in avcodec_decode_audio3() unless CODEC_CAP_DELAY is set.

[Justin Ruggles]

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 9f198cb..c604819 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -747,7 +747,7 @@ int attribute_align_arg 
avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
 
     avctx->pkt = avpkt;
 
-    if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){
+    if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || (avpkt->data && 
avpkt->size)) {
         //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");
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel