aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-03-01 09:41:22 -0800
committerRonald S. Bultje <rsbultje@gmail.com>2012-03-01 10:23:36 -0800
commit63c9de6469005974288f4e4d89fc79a590e38c06 (patch)
tree72c97c193fa59e069d7dcec31dea9a5c98aa72c4
parentbd17a40a7e0eba21b5d27c67aff795e2910766e4 (diff)
downloadffmpeg-63c9de6469005974288f4e4d89fc79a590e38c06.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
-rw-r--r--libavcodec/huffyuv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index 4f07808805..bedaaf2f91 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);