avcodec/tiff: Refactor TIFF tag related functions to share the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 21 deletions

diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h
index 3ea2158033..ae189b6fdd 100644
--- a/libavcodec/tiff.h
+++ b/libavcodec/tiff.h
@@ -31,6 +31,7 @@
 #define AVCODEC_TIFF_H
 
 #include <stdint.h>
+#include "tiff_common.h"
 
 /** abridged list of TIFF tags */
 enum TiffTags {
@@ -97,22 +98,6 @@ enum TiffCompr {
     TIFF_DEFLATE  = 0x80B2
 };
 
-enum TiffTypes {
-    TIFF_BYTE = 1,
-    TIFF_STRING,
-    TIFF_SHORT,
-    TIFF_LONG,
-    TIFF_RATIONAL,
-    TIFF_SBYTE,
-    TIFF_UNDEFINED,
-    TIFF_SSHORT,
-    TIFF_SLONG,
-    TIFF_SRATIONAL,
-    TIFF_FLOAT,
-    TIFF_DOUBLE,
-    TIFF_IFD
-};
-
 enum TiffGeoTagKey {
     TIFF_GT_MODEL_TYPE_GEOKEY                = 1024,
     TIFF_GT_RASTER_TYPE_GEOKEY               = 1025,
@@ -167,11 +152,6 @@ enum TiffGeoTagType {
     GEOTIFF_STRING = 34737
 };
 
-/** sizes of various TIFF field types (string size = 100)*/
-static const uint8_t type_sizes[14] = {
-    0, 1, 100, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 4
-};
-
 typedef struct TiffGeoTag {
     enum TiffGeoTagKey key;
     enum TiffTags type;