diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-01 09:41:22 -0800 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-04 12:26:06 +0100 |
| commit | a63f3f714c014b3fcaffd45943bc089167b3fe61 (patch) | |
| tree | 65a6be7195405037d37e3c4fee7dcca5c6876811 | |
| parent | 1dd1ee00d54ba2a9f5d8ae2e82a22891300b6807 (diff) | |
| download | ffmpeg-a63f3f714c014b3fcaffd45943bc089167b3fe61.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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index efa87de802..412fe4b68d 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); |