From 9cfc1b3a840926435c2024fe7537e648405704fc Mon Sep 17 00:00:00 2001 From: Ivan Kalvachev Date: Thu, 19 Feb 2009 08:39:47 +0000 Subject: [PATCH] Exit with error if MPV_common_init() is called with PIX_FMT_NONE. Give nice error message to fix codecs that call it this way. Originally committed as revision 17452 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 409661eceb..2eec211abc 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -402,6 +402,11 @@ int MPV_common_init(MpegEncContext *s) s->mb_height = (s->height + 15) / 16; + if(s->avctx->pix_fmt == PIX_FMT_NONE){ + av_log(s->avctx, AV_LOG_ERROR, "decoding to PIX_FMT_NONE is not supported.\n"); + return -1; + } + if(s->avctx->thread_count > MAX_THREADS || (s->avctx->thread_count > s->mb_height && s->mb_height)){ av_log(s->avctx, AV_LOG_ERROR, "too many threads\n"); return -1;