From 0b2df545249c2809c00fca2a31536f046ee7f5c8 Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Sat, 10 Sep 2011 12:31:43 +0200 Subject: [PATCH] libav 0.7: switch to generic AVDictionary for metadata handling --- src/filescanner_ffmpeg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/filescanner_ffmpeg.c b/src/filescanner_ffmpeg.c index feb2aacc..33aad4d6 100644 --- a/src/filescanner_ffmpeg.c +++ b/src/filescanner_ffmpeg.c @@ -203,9 +203,17 @@ static const struct metadata_map md_map_id3[] = static int +#if LIBAVUTIL_VERSION_MAJOR >= 51 || (LIBAVUTIL_VERSION_MAJOR == 51 && LIBAVUTIL_VERSION_MINOR >= 5) +extract_metadata_core(struct media_file_info *mfi, AVDictionary *md, const struct metadata_map *md_map) +#else extract_metadata_core(struct media_file_info *mfi, AVMetadata *md, const struct metadata_map *md_map) +#endif { +#if LIBAVUTIL_VERSION_MAJOR >= 51 || (LIBAVUTIL_VERSION_MAJOR == 51 && LIBAVUTIL_VERSION_MINOR >= 5) + AVDictionaryEntry *mdt; +#else AVMetadataTag *mdt; +#endif char **strval; uint32_t *intval; int mdcount; @@ -215,7 +223,11 @@ extract_metadata_core(struct media_file_info *mfi, AVMetadata *md, const struct #if 0 /* Dump all the metadata reported by ffmpeg */ mdt = NULL; +#if LIBAVUTIL_VERSION_MAJOR >= 51 || (LIBAVUTIL_VERSION_MAJOR == 51 && LIBAVUTIL_VERSION_MINOR >= 5) + while ((mdt = av_dict_get(md, "", mdt, AV_DICT_IGNORE_SUFFIX)) != NULL) +#else while ((mdt = av_metadata_get(md, "", mdt, AV_METADATA_IGNORE_SUFFIX)) != NULL) +#endif fprintf(stderr, " -> %s = %s\n", mdt->key, mdt->value); #endif @@ -224,7 +236,11 @@ extract_metadata_core(struct media_file_info *mfi, AVMetadata *md, const struct /* Extract actual metadata */ for (i = 0; md_map[i].key != NULL; i++) { +#if LIBAVUTIL_VERSION_MAJOR >= 51 || (LIBAVUTIL_VERSION_MAJOR == 51 && LIBAVUTIL_VERSION_MINOR >= 5) + mdt = av_dict_get(md, md_map[i].key, NULL, 0); +#else mdt = av_metadata_get(md, md_map[i].key, NULL, 0); +#endif if (mdt == NULL) continue;