diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-09-28 05:15:27 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-09-28 05:15:27 +0000 |
| commit | 7c6f5238c68b1fa5e0d61afaa3f6c68e586cf9c5 (patch) | |
| tree | 66a8a162629685fcb31635972fe0ef89c9791b20 /libavcodec/tiff.c | |
| parent | ec71a8e00bc73c5c8b84d30d228259b2e90b7bd2 (diff) | |
Make TIFF decoder load compression options only for corresponding codec
Originally committed as revision 20064 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index c4f4523359..536b74f391 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -437,8 +437,12 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t * } break; case TIFF_T4OPTIONS: + if(s->compr == TIFF_G3) + s->fax_opts = value; + break; case TIFF_T6OPTIONS: - s->fax_opts = value; + if(s->compr == TIFF_G4) + s->fax_opts = value; break; } return 0; |