[FFmpeg-cvslog] lavc/pcm: clarify error message from pcm_decode_frame()

Stefano Sabatini git at videolan.org
Sat Jun 23 00:45:42 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Fri Jun 22 17:43:40 2012 +0200| [201b409da0d81dce19caa1393fe1c9f8e17aeb92] | committer: Stefano Sabatini

lavc/pcm: clarify error message from pcm_decode_frame()

Extend/clarify an error message in case of invalid packet size, and
return a proper error message instead of -1.
Improve debuggability.

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

 libavcodec/pcm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index c72b200..826267f 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -293,8 +293,10 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
 
     if (n && buf_size % n) {
         if (buf_size < n) {
-            av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n");
-            return -1;
+            av_log(avctx, AV_LOG_ERROR,
+                   "Invalid PCM packet, data has size %d but at least a size of %d was expected\n",
+                   buf_size, n);
+            return AVERROR_INVALIDDATA;
         } else
             buf_size -= buf_size % n;
     }



More information about the ffmpeg-cvslog mailing list