diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 20:52:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-29 12:19:47 +0200 |
commit | e40c96513efb069fd189beb64a2265971afb410f (patch) | |
tree | 9280607afbcee14c59c22090b332ff4416cbd9f4 | |
parent | 7859e89ff0f9b3e701284230d275c59d8a5d615a (diff) | |
download | ffmpeg-e40c96513efb069fd189beb64a2265971afb410f.tar.gz |
avcodec/exif: print bytes and undefined types as scalar lists
This prevents odd characters from ending in the fate test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/exif.c | 2 | ||||
-rw-r--r-- | tests/ref/fate/exif-image-jpg | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/exif.c b/libavcodec/exif.c index ec524a5943..96464261c1 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -50,7 +50,7 @@ static int exif_add_metadata(AVCodecContext *avctx, int count, int type, case TIFF_DOUBLE : return ff_tadd_doubles_metadata(count, name, sep, gb, le, metadata); case TIFF_SHORT : return ff_tadd_shorts_metadata(count, name, sep, gb, le, metadata); case TIFF_BYTE : - case TIFF_UNDEFINED: + case TIFF_UNDEFINED: return ff_tadd_bytes_metadata(count, name, sep, gb, le, metadata); case TIFF_STRING : return ff_tadd_string_metadata(count, name, gb, le, metadata); case TIFF_SRATIONAL: case TIFF_RATIONAL : return ff_tadd_rational_metadata(count, name, sep, gb, le, metadata); diff --git a/tests/ref/fate/exif-image-jpg b/tests/ref/fate/exif-image-jpg index a634a87c55..8c649ba1aa 100644 --- a/tests/ref/fate/exif-image-jpg +++ b/tests/ref/fate/exif-image-jpg @@ -31,10 +31,10 @@ TAG:YCbCrPositioning=2 TAG:ExposureTime=1:1250 TAG:FNumber=40:10 TAG:ISOSpeedRatings=160 -TAG:ExifVersion=0221 +TAG:ExifVersion=48, 50, 50, 49 TAG:DateTimeOriginal=2013:07:18 13:12:03 TAG:DateTimeDigitized=2013:07:18 13:12:03 -TAG:ComponentsConfiguration= +TAG:ComponentsConfiguration=1, 2, 3, 0 TAG:CompressedBitsPerPixel=3:1 TAG:ShutterSpeedValue=329:32 TAG:ApertureValue=128:32 @@ -43,21 +43,21 @@ TAG:MaxApertureValue=113:32 TAG:MeteringMode=5 TAG:Flash=16 TAG:FocalLength=5000:1000 -TAG:MakerNote= -TAG:UserComment= -TAG:FlashpixVersion=0100 +TAG:MakerNote=25, 0, 1, 0, 3, 0, 48, 0, 0, 0, 28, 4, 0, 0, 2, 0, 3, 0, 4, 0, 0, 0, 124, 4, 0, 0, 3, 0, 3, 0, 4, 0, 0, 0, 132, 4, 0, 0, 4, 0, 3, 0, 34, 0, 0, 0, 140, 4, 0, 0, 0, 0, 3, 0, 6, 0, 0, 0, 208, 4, 0, 0, 6, 0, 2, 0, 28, 0, 0, 0, 220, 4, 0, 0, 7, 0, 2, 0, 22, 0, 0, 0, 252, 4, 0, 0, 8, 0, 4, 0, 1, 0, 0, 0, 17, 166, 15, 0, 9, 0, 2, 0, 32, 0, 0, 0, 20, 5, 0, 0, 13, 0, 4, 0, 167, 0, 0, 0, 52, 5, 0, 0, 16, 0, 4, 0, 1, 0, 0, 0, 0, 0, 96, 2, 38, 0, 3, 0, 48, 0, 0, 0, 208, 7, 0, 0, 19, 0, 3, 0, 4, 0, 0, 0, 48, 8, 0, 0, 24, 0, 1, 0, 0, 1, 0, 0, 56, 8, 0, 0, 25, 0, 3, 0, 1, 0, 0, 0, 1, 0, 0, 0, 28, 0, 3, 0, 1, 0, 0, 0, 0, 0, 0, 0, 29, 0, 3, 0, 16, 0, 0, 0, 56, 9, 0, 0, 30, 0, 4, 0, 1, 0, 0, 0, 0, 4, 0, 1, 31, 0, 3, 0, 69, 0, 0, 0, 88, 9, 0, 0, 34, 0, 3, 0, 208, 0, 0, 0, 226, 9, 0, 0, 35, 0, 4, 0, 2, 0, 0, 0, 130, 11, 0, 0, 39, 0, 3, 0, 5, 0, 0, 0, 138, 11, 0, 0, 40, 0, 1, 0, 16, 0, 0, 0, 148, 11, 0, 0, 208, 0, 4, 0, 1, 0, 0, 0, 0, 0, 0, 0, 45, 0, 4, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +TAG:UserComment=0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +TAG:FlashpixVersion=48, 49, 48, 48 TAG:ColorSpace=1 TAG:PixelXDimension=4000 TAG:PixelYDimension=2248 TAG:GPSLatitudeRef=R98 -TAG:GPSLatitude=0100 +TAG:GPSLatitude=48, 49, 48, 48 TAG:0x1001=4000 TAG:0x1002=2248 TAG:FocalPlaneXResolution=4000000:244 TAG:FocalPlaneYResolution=2248000:183 TAG:FocalPlaneResolutionUnit=2 TAG:SensingMethod=2 -TAG:FileSource= +TAG:FileSource=3 TAG:CustomRendered=0 TAG:ExposureMode=0 TAG:WhiteBalance=0 |