[FFmpeg-cvslog] avcodec/dca: print error message when no frame is found in packet

foo86 git at videolan.org
Sat May 14 20:02:49 CEST 2016


ffmpeg | branch: master | foo86 <foobaz86 at gmail.com> | Fri May 13 12:48:25 2016 +0300| [365b0c13e461a5d92e9e689e8f09301fb3255b93] | committer: Michael Niedermayer

avcodec/dca: print error message when no frame is found in packet

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/dcadec.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 303b0c2..f31b658 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -179,8 +179,10 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
     for (i = 0, ret = AVERROR_INVALIDDATA; i < input_size - MIN_PACKET_SIZE + 1 && ret < 0; i++)
         ret = convert_bitstream(input + i, input_size - i, s->buffer, s->buffer_size);
 
-    if (ret < 0)
+    if (ret < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");
         return ret;
+    }
 
     input      = s->buffer;
     input_size = ret;
@@ -296,6 +298,9 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
         }
         s->core_residual_valid = !!(s->core.filter_mode & DCA_FILTER_MODE_FIXED);
     } else {
+        av_log(avctx, AV_LOG_ERROR, "No valid DCA sub-stream found\n");
+        if (s->core_only)
+            av_log(avctx, AV_LOG_WARNING, "Consider disabling 'core_only' option\n");
         return AVERROR_INVALIDDATA;
     }
 



More information about the ffmpeg-cvslog mailing list