bail out on unknown jpeg pixel format instead of silently decoding data incorrectly
authorAndreas Öman <andreas@olebyn.nu>
Thu, 19 Jul 2007 15:56:56 +0000 (15:56 +0000)
committerGuillaume Poirier <gpoirier@mplayerhq.hu>
Thu, 19 Jul 2007 15:56:56 +0000 (15:56 +0000)
patch by Andreas Öman % andreas A olebyn P nu %
Original thread:
date: Jul 19, 2007 4:50 PM
subject: [FFmpeg-devel] [PATCH] bail out on unknown jpeg pixel format

Originally committed as revision 9764 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/mjpegdec.c

index d65a346..aa8d2e4 100644 (file)
@@ -305,10 +305,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
     case 0x221212:
         s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV422P : PIX_FMT_YUVJ422P;
         break;
-    default:
     case 0x221111:
         s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV420P : PIX_FMT_YUVJ420P;
         break;
+    default:
+        av_log(s->avctx, AV_LOG_ERROR, "Unhandled pixel format 0x%x\n", pix_fmt_id);
+        return -1;
     }
     if(s->ls){
         if(s->nb_components > 1)