diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-07-24 11:58:11 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-07-24 11:58:11 +0200 |
| commit | badcd3da81ac447d71c8d6d91bfaa3f49cd5ed6b (patch) | |
| tree | f9a34a9b546262527554d681a2acb41acb2bedf9 /libavcodec/exif.c | |
| parent | f7539562522ba44db5d1467d43b917638d58bb05 (diff) | |
| download | ffmpeg-badcd3da81ac447d71c8d6d91bfaa3f49cd5ed6b.tar.gz | |
Print a warning instead of requesting a sample for an invalid exif tag.
Fixes ticket #3792.
Reviewed-by: Thilo Borgmann
Diffstat (limited to 'libavcodec/exif.c')
| -rw-r--r-- | libavcodec/exif.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/exif.c b/libavcodec/exif.c index a980da2a7b..fa30f0573f 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -47,6 +47,11 @@ static int exif_add_metadata(AVCodecContext *avctx, int count, int type, AVDictionary **metadata) { switch(type) { + case 0: + av_log(avctx, AV_LOG_WARNING, + "Invalid TIFF tag type 0 found for %s with size %d\n", + name, count); + return 0; case TIFF_DOUBLE : return ff_tadd_doubles_metadata(count, name, sep, gb, le, metadata); case TIFF_SSHORT : return ff_tadd_shorts_metadata(count, name, sep, gb, le, 1, metadata); case TIFF_SHORT : return ff_tadd_shorts_metadata(count, name, sep, gb, le, 0, metadata); |