aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-03-01 09:41:22 -0800
committerReinhard Tartler <siretart@tauware.de>2012-04-01 18:33:27 +0200
commitd680295d0c3662793292338d0fd01b044601f338 (patch)
treea4cebd3d8c11d9df142aad31c691c1dd4706b86a
parentced190c96c1fa99ca395ad02290f9784f07b07ee (diff)
downloadffmpeg-d680295d0c3662793292338d0fd01b044601f338.tar.gz
huffyuv: do not abort on unknown pix_fmt; instead, return an error.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 63c9de6469005974288f4e4d89fc79a590e38c06) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavcodec/huffyuv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index d211964eca..eb13d87f87 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);