Mercurial > libavcodec.hg
comparison mjpegdec.c @ 5381:4cac2cfe2745 libavcodec
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
| author | gpoirier |
|---|---|
| date | Thu, 19 Jul 2007 15:56:56 +0000 |
| parents | 1a25f2f6316e |
| children | 41103dc22ad5 |
comparison
equal
deleted
inserted
replaced
| 5380:389366aa3458 | 5381:4cac2cfe2745 |
|---|---|
| 303 break; | 303 break; |
| 304 case 0x211111: | 304 case 0x211111: |
| 305 case 0x221212: | 305 case 0x221212: |
| 306 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV422P : PIX_FMT_YUVJ422P; | 306 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV422P : PIX_FMT_YUVJ422P; |
| 307 break; | 307 break; |
| 308 default: | |
| 309 case 0x221111: | 308 case 0x221111: |
| 310 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV420P : PIX_FMT_YUVJ420P; | 309 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV420P : PIX_FMT_YUVJ420P; |
| 311 break; | 310 break; |
| 311 default: | |
| 312 av_log(s->avctx, AV_LOG_ERROR, "Unhandled pixel format 0x%x\n", pix_fmt_id); | |
| 313 return -1; | |
| 312 } | 314 } |
| 313 if(s->ls){ | 315 if(s->ls){ |
| 314 if(s->nb_components > 1) | 316 if(s->nb_components > 1) |
| 315 s->avctx->pix_fmt = PIX_FMT_RGB24; | 317 s->avctx->pix_fmt = PIX_FMT_RGB24; |
| 316 else if(s->bits <= 8) | 318 else if(s->bits <= 8) |