diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2006-11-13 05:29:45 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2006-11-13 05:29:45 +0000 |
| commit | 27c189394ba2b9a59ca303b893c072b873357ff0 (patch) | |
| tree | 175509f95ce6b56ac70d73c87e051e01ca395850 /libavcodec/tiff.c | |
| parent | ec8a152b6fbe2b06318c83839561191178748e1a (diff) | |
Warn about JPEG in TIFF
Originally committed as revision 7003 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index ee2627c8e8..954e40f0a2 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -282,6 +282,10 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t case TIFF_CCITT_RLE: av_log(s->avctx, AV_LOG_ERROR, "CCITT RLE compression is not supported\n"); return -1; + case TIFF_JPEG: + case TIFF_NEWJPEG: + av_log(s->avctx, AV_LOG_ERROR, "JPEG compression is not supported\n"); + return -1; default: av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n", s->compr); return -1; |