Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 17:51:53 +0000 (19:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 17:52:22 +0000 (19:52 +0200)
* commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0':
  tiff: Return proper error for missing LZMA compression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/tiff.c
libavcodec/tiff.h

Simple merge
@@@ -95,55 -71,16 +95,56 @@@ enum TiffCompr 
      TIFF_NEWJPEG,
      TIFF_ADOBE_DEFLATE,
      TIFF_PACKBITS = 0x8005,
-     TIFF_DEFLATE  = 0x80B2
+     TIFF_DEFLATE  = 0x80B2,
+     TIFF_LZMA     = 0x886D,
  };
  
 -enum TiffTypes {
 -    TIFF_BYTE = 1,
 -    TIFF_STRING,
 -    TIFF_SHORT,
 -    TIFF_LONG,
 -    TIFF_RATIONAL,
 +enum TiffGeoTagKey {
 +    TIFF_GT_MODEL_TYPE_GEOKEY                = 1024,
 +    TIFF_GT_RASTER_TYPE_GEOKEY               = 1025,
 +    TIFF_GT_CITATION_GEOKEY                  = 1026,
 +    TIFF_GEOGRAPHIC_TYPE_GEOKEY              = 2048,
 +    TIFF_GEOG_CITATION_GEOKEY                = 2049,
 +    TIFF_GEOG_GEODETIC_DATUM_GEOKEY          = 2050,
 +    TIFF_GEOG_PRIME_MERIDIAN_GEOKEY          = 2051,
 +    TIFF_GEOG_LINEAR_UNITS_GEOKEY            = 2052,
 +    TIFF_GEOG_LINEAR_UNIT_SIZE_GEOKEY        = 2053,
 +    TIFF_GEOG_ANGULAR_UNITS_GEOKEY           = 2054,
 +    TIFF_GEOG_ANGULAR_UNIT_SIZE_GEOKEY       = 2055,
 +    TIFF_GEOG_ELLIPSOID_GEOKEY               = 2056,
 +    TIFF_GEOG_SEMI_MAJOR_AXIS_GEOKEY         = 2057,
 +    TIFF_GEOG_SEMI_MINOR_AXIS_GEOKEY         = 2058,
 +    TIFF_GEOG_INV_FLATTENING_GEOKEY          = 2059,
 +    TIFF_GEOG_AZIMUTH_UNITS_GEOKEY           = 2060,
 +    TIFF_GEOG_PRIME_MERIDIAN_LONG_GEOKEY     = 2061,
 +    TIFF_PROJECTED_CS_TYPE_GEOKEY            = 3072,
 +    TIFF_PCS_CITATION_GEOKEY                 = 3073,
 +    TIFF_PROJECTION_GEOKEY                   = 3074,
 +    TIFF_PROJ_COORD_TRANS_GEOKEY             = 3075,
 +    TIFF_PROJ_LINEAR_UNITS_GEOKEY            = 3076,
 +    TIFF_PROJ_LINEAR_UNIT_SIZE_GEOKEY        = 3077,
 +    TIFF_PROJ_STD_PARALLEL1_GEOKEY           = 3078,
 +    TIFF_PROJ_STD_PARALLEL2_GEOKEY           = 3079,
 +    TIFF_PROJ_NAT_ORIGIN_LONG_GEOKEY         = 3080,
 +    TIFF_PROJ_NAT_ORIGIN_LAT_GEOKEY          = 3081,
 +    TIFF_PROJ_FALSE_EASTING_GEOKEY           = 3082,
 +    TIFF_PROJ_FALSE_NORTHING_GEOKEY          = 3083,
 +    TIFF_PROJ_FALSE_ORIGIN_LONG_GEOKEY       = 3084,
 +    TIFF_PROJ_FALSE_ORIGIN_LAT_GEOKEY        = 3085,
 +    TIFF_PROJ_FALSE_ORIGIN_EASTING_GEOKEY    = 3086,
 +    TIFF_PROJ_FALSE_ORIGIN_NORTHING_GEOKEY   = 3087,
 +    TIFF_PROJ_CENTER_LONG_GEOKEY             = 3088,
 +    TIFF_PROJ_CENTER_LAT_GEOKEY              = 3089,
 +    TIFF_PROJ_CENTER_EASTING_GEOKEY          = 3090,
 +    TIFF_PROJ_CENTER_NORTHING_GEOKEY         = 3091,
 +    TIFF_PROJ_SCALE_AT_NAT_ORIGIN_GEOKEY     = 3092,
 +    TIFF_PROJ_SCALE_AT_CENTER_GEOKEY         = 3093,
 +    TIFF_PROJ_AZIMUTH_ANGLE_GEOKEY           = 3094,
 +    TIFF_PROJ_STRAIGHT_VERT_POLE_LONG_GEOKEY = 3095,
 +    TIFF_VERTICAL_CS_TYPE_GEOKEY             = 4096,
 +    TIFF_VERTICAL_CITATION_GEOKEY            = 4097,
 +    TIFF_VERTICAL_DATUM_GEOKEY               = 4098,
 +    TIFF_VERTICAL_UNITS_GEOKEY               = 4099
  };
  
  enum TiffPhotometric {