[FFmpeg-cvslog] huffyuv: do not abort on unknown pix_fmt; instead, return an error.

Ronald S. Bultje git at videolan.org
Mon Apr 2 01:45:17 CEST 2012


ffmpeg | branch: release/0.8 | Ronald S. Bultje <rsbultje at gmail.com> | Thu Mar  1 09:41:22 2012 -0800| [d680295d0c3662793292338d0fd01b044601f338] | committer: Reinhard Tartler

huffyuv: do not abort on unknown pix_fmt; instead, return an error.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
(cherry picked from commit 63c9de6469005974288f4e4d89fc79a590e38c06)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

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

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

diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index d211964..eb13d87 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -514,7 +514,7 @@ s->bgr32=1;
         }
         break;
     default:
-        assert(0);
+        return AVERROR_INVALIDDATA;
     }
 
     alloc_temp(s);



More information about the ffmpeg-cvslog mailing list