[FFmpeg-cvslog] r9764 - trunk/libavcodec/mjpegdec.c

gpoirier subversion
Thu Jul 19 17:56:57 CEST 2007


Author: gpoirier
Date: Thu Jul 19 17:56:56 2007
New Revision: 9764

Log:
bail out on unknown jpeg pixel format instead of silently decoding data incorrectly
patch by Andreas Oman % 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


Modified:
   trunk/libavcodec/mjpegdec.c

Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c	(original)
+++ trunk/libavcodec/mjpegdec.c	Thu Jul 19 17:56:56 2007
@@ -305,10 +305,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeConte
     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)




More information about the ffmpeg-cvslog mailing list