RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bail out on unknown jpeg pixel format instead of silently decoding data incorrectly 

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
This commit is contained in:
Andreas Öman 2007-07-19 15:56:56 +00:00 committed by Guillaume Poirier
parent 85565db0f8
commit 83c43e4d52
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mjpegdec.c
View 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)