mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/tiff_data: Move data to its only user
tiff.c is the only user of the data from tiff_data.c (the dependency of the tiff encoder of it is spurious). Therefore this commit moves all the data from tiff_data.c to tiff_data.h (which is only included by tiff.c) and makes the objects declared therein static. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
parent
926c1bf85c
commit
ad58113afe
|
@ -658,8 +658,8 @@ OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o
|
||||||
OBJS-$(CONFIG_TARGA_Y216_DECODER) += targa_y216dec.o
|
OBJS-$(CONFIG_TARGA_Y216_DECODER) += targa_y216dec.o
|
||||||
OBJS-$(CONFIG_TDSC_DECODER) += tdsc.o
|
OBJS-$(CONFIG_TDSC_DECODER) += tdsc.o
|
||||||
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
|
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
|
||||||
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o faxcompr.o tiff_data.o tiff_common.o
|
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o faxcompr.o tiff_common.o
|
||||||
OBJS-$(CONFIG_TIFF_ENCODER) += tiffenc.o rle.o lzwenc.o tiff_data.o
|
OBJS-$(CONFIG_TIFF_ENCODER) += tiffenc.o rle.o lzwenc.o
|
||||||
OBJS-$(CONFIG_TMV_DECODER) += tmv.o cga_data.o
|
OBJS-$(CONFIG_TMV_DECODER) += tmv.o cga_data.o
|
||||||
OBJS-$(CONFIG_TRUEHD_DECODER) += mlpdec.o mlpdsp.o
|
OBJS-$(CONFIG_TRUEHD_DECODER) += mlpdec.o mlpdsp.o
|
||||||
OBJS-$(CONFIG_TRUEHD_ENCODER) += mlpenc.o mlp.o
|
OBJS-$(CONFIG_TRUEHD_ENCODER) += mlpenc.o mlp.o
|
||||||
|
|
|
@ -132,8 +132,8 @@ static void free_geotags(TiffContext *const s)
|
||||||
|
|
||||||
#define RET_GEOKEY(TYPE, array, element)\
|
#define RET_GEOKEY(TYPE, array, element)\
|
||||||
if (key >= TIFF_##TYPE##_KEY_ID_OFFSET &&\
|
if (key >= TIFF_##TYPE##_KEY_ID_OFFSET &&\
|
||||||
key - TIFF_##TYPE##_KEY_ID_OFFSET < FF_ARRAY_ELEMS(ff_tiff_##array##_name_type_map))\
|
key - TIFF_##TYPE##_KEY_ID_OFFSET < FF_ARRAY_ELEMS(tiff_##array##_name_type_map))\
|
||||||
return ff_tiff_##array##_name_type_map[key - TIFF_##TYPE##_KEY_ID_OFFSET].element;
|
return tiff_##array##_name_type_map[key - TIFF_##TYPE##_KEY_ID_OFFSET].element;
|
||||||
|
|
||||||
static const char *get_geokey_name(int key)
|
static const char *get_geokey_name(int key)
|
||||||
{
|
{
|
||||||
|
@ -180,8 +180,8 @@ static char *get_geokey_val(int key, int val)
|
||||||
|
|
||||||
#define RET_GEOKEY_VAL(TYPE, array)\
|
#define RET_GEOKEY_VAL(TYPE, array)\
|
||||||
if (val >= TIFF_##TYPE##_OFFSET &&\
|
if (val >= TIFF_##TYPE##_OFFSET &&\
|
||||||
val - TIFF_##TYPE##_OFFSET < FF_ARRAY_ELEMS(ff_tiff_##array##_codes))\
|
val - TIFF_##TYPE##_OFFSET < FF_ARRAY_ELEMS(tiff_##array##_codes))\
|
||||||
return av_strdup(ff_tiff_##array##_codes[val - TIFF_##TYPE##_OFFSET]);
|
return av_strdup(tiff_##array##_codes[val - TIFF_##TYPE##_OFFSET]);
|
||||||
|
|
||||||
switch (key) {
|
switch (key) {
|
||||||
case TIFF_GT_MODEL_TYPE_GEOKEY:
|
case TIFF_GT_MODEL_TYPE_GEOKEY:
|
||||||
|
@ -214,11 +214,11 @@ static char *get_geokey_val(int key, int val)
|
||||||
RET_GEOKEY_VAL(PRIME_MERIDIAN, prime_meridian);
|
RET_GEOKEY_VAL(PRIME_MERIDIAN, prime_meridian);
|
||||||
break;
|
break;
|
||||||
case TIFF_PROJECTED_CS_TYPE_GEOKEY:
|
case TIFF_PROJECTED_CS_TYPE_GEOKEY:
|
||||||
ap = av_strdup(search_keyval(ff_tiff_proj_cs_type_codes, FF_ARRAY_ELEMS(ff_tiff_proj_cs_type_codes), val));
|
ap = av_strdup(search_keyval(tiff_proj_cs_type_codes, FF_ARRAY_ELEMS(tiff_proj_cs_type_codes), val));
|
||||||
if(ap) return ap;
|
if(ap) return ap;
|
||||||
break;
|
break;
|
||||||
case TIFF_PROJECTION_GEOKEY:
|
case TIFF_PROJECTION_GEOKEY:
|
||||||
ap = av_strdup(search_keyval(ff_tiff_projection_codes, FF_ARRAY_ELEMS(ff_tiff_projection_codes), val));
|
ap = av_strdup(search_keyval(tiff_projection_codes, FF_ARRAY_ELEMS(tiff_projection_codes), val));
|
||||||
if(ap) return ap;
|
if(ap) return ap;
|
||||||
break;
|
break;
|
||||||
case TIFF_PROJ_COORD_TRANS_GEOKEY:
|
case TIFF_PROJ_COORD_TRANS_GEOKEY:
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue