[FFmpeg-cvslog] rawdec: fail in case of unknow pixel format

Stefano Sabatini git at videolan.org
Mon May 30 09:46:43 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Mon May 30 01:42:45 2011 +0200| [50fee0fc8b2540eade190575ab7802826597bf32] | committer: Stefano Sabatini

rawdec: fail in case of unknow pixel format

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

 libavcodec/rawdec.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index f8e119b..503351e 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -97,6 +97,11 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
     else if (avctx->pix_fmt == PIX_FMT_NONE && avctx->bits_per_coded_sample)
         avctx->pix_fmt = ff_find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample);
 
+    if (avctx->pix_fmt == PIX_FMT_NONE) {
+        av_log(avctx, AV_LOG_ERROR, "Pixel format was not specified and cannot be detected\n");
+        return AVERROR(EINVAL);
+    }
+
     ff_set_systematic_pal2(context->palette, avctx->pix_fmt);
     context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
     if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&



More information about the ffmpeg-cvslog mailing list