[FFmpeg-cvslog] flicvideo: increase error level and fix error message in CHECK_PIXEL_PTR()

Stefano Sabatini git at videolan.org
Sat Apr 23 12:17:17 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat Apr 23 00:07:15 2011 +0200| [cd1872799d89a87b1d06132118836c82cda2a44f] | committer: Stefano Sabatini

flicvideo: increase error level and fix error message in CHECK_PIXEL_PTR()

Also return AVERROR_INVALIDDATA rather than -1.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala at poste.it>

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

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

diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 913617d..126c4e1 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -61,9 +61,9 @@
 
 #define CHECK_PIXEL_PTR(n) \
     if (pixel_ptr + n > pixel_limit) { \
-        av_log (s->avctx, AV_LOG_INFO, "Problem: pixel_ptr >= pixel_limit (%d >= %d)\n", \
+        av_log (s->avctx, AV_LOG_ERROR, "Invalid pixel_ptr = %d > pixel_limit = %d\n", \
         pixel_ptr + n, pixel_limit); \
-        return -1; \
+        return AVERROR_INVALIDDATA; \
     } \
 
 typedef struct FlicDecodeContext {



More information about the ffmpeg-cvslog mailing list