diff options
| author | Thilo Borgmann <thilo.borgmann@mail.de> | 2014-03-26 11:25:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 03:31:56 +0200 |
| commit | 8c161d7884f0547a605c1221ec4cad020922d4aa (patch) | |
| tree | e6908762c60e55d2f043a15c4ce545d7a65b1d6e | |
| parent | 7a5537fd3fd06f71c077ef06467149390ed491ea (diff) | |
| download | ffmpeg-8c161d7884f0547a605c1221ec4cad020922d4aa.tar.gz | |
lavc/exif: Make EXIF IFD decoding part of private API/ABI.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/exif.c | 4 | ||||
| -rw-r--r-- | libavcodec/exif.h | 2 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 | ||||
| -rw-r--r-- | libavcodec/webp.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/exif.c b/libavcodec/exif.c index 96464261c1..9b3e8cbab1 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -80,7 +80,7 @@ static int exif_decode_tag(AVCodecContext *avctx, GetByteContext *gbytes, int le // store metadata or proceed with next IFD ret = ff_tis_ifd(id); if (ret) { - ret = ff_exif_decode_ifd(avctx, gbytes, le, depth + 1, metadata); + ret = avpriv_exif_decode_ifd(avctx, gbytes, le, depth + 1, metadata); } else { const char *name = exif_get_tag_name(id); char *use_name = (char*) name; @@ -107,7 +107,7 @@ static int exif_decode_tag(AVCodecContext *avctx, GetByteContext *gbytes, int le } -int ff_exif_decode_ifd(AVCodecContext *avctx, GetByteContext *gbytes, int le, +int avpriv_exif_decode_ifd(AVCodecContext *avctx, GetByteContext *gbytes, int le, int depth, AVDictionary **metadata) { int i, ret; diff --git a/libavcodec/exif.h b/libavcodec/exif.h index 71fe8292e1..e673dc0311 100644 --- a/libavcodec/exif.h +++ b/libavcodec/exif.h @@ -164,7 +164,7 @@ static const struct exif_tag tag_list[] = { // JEITA CP-3451 EXIF specification: /** Recursively decodes all IFD's and * adds included TAGS into the metadata dictionary. */ -int ff_exif_decode_ifd(AVCodecContext *avctx, GetByteContext *gbytes, int le, +int avpriv_exif_decode_ifd(AVCodecContext *avctx, GetByteContext *gbytes, int le, int depth, AVDictionary **metadata); #endif /* AVCODEC_EXIF_H */ diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 9f7d08fc85..6a93f4afdd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1672,7 +1672,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) // read 0th IFD and store the metadata // (return values > 0 indicate the presence of subimage metadata) - ret = ff_exif_decode_ifd(s->avctx, &gbytes, le, 0, &s->exif_metadata); + ret = avpriv_exif_decode_ifd(s->avctx, &gbytes, le, 0, &s->exif_metadata); if (ret < 0) { av_log(s->avctx, AV_LOG_ERROR, "mjpeg: error decoding EXIF data\n"); return ret; diff --git a/libavcodec/version.h b/libavcodec/version.h index 61b32f2121..6472c0f59f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 56 -#define LIBAVCODEC_VERSION_MICRO 108 +#define LIBAVCODEC_VERSION_MINOR 57 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 89c8f13176..4dbdf786c8 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1449,7 +1449,7 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } bytestream2_seek(&exif_gb, ifd_offset, SEEK_SET); - if (ff_exif_decode_ifd(avctx, &exif_gb, le, 0, &s->exif_metadata) < 0) { + if (avpriv_exif_decode_ifd(avctx, &exif_gb, le, 0, &s->exif_metadata) < 0) { av_log(avctx, AV_LOG_ERROR, "error decoding Exif data\n"); goto exif_end; } |