MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 14:43:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

libav 0.7: switch to generic AVDictionary for metadata handling

Browse Source
This commit is contained in:
Julien BLACHE 2011-09-10 12:31:43 +02:00
parent a2f409dd0a
commit 0b2df54524
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/filescanner_ffmpeg.c
View File

@ -203,9 +203,17 @@ static const struct metadata_map md_map_id3[] =
static int 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) 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; AVMetadataTag *mdt;
#endif
char **strval; char **strval;
uint32_t *intval; uint32_t *intval;
int mdcount; int mdcount;
@ -215,7 +223,11 @@ extract_metadata_core(struct media_file_info *mfi, AVMetadata *md, const struct
#if 0 #if 0
/* Dump all the metadata reported by ffmpeg */ /* Dump all the metadata reported by ffmpeg */
mdt = NULL; 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) while ((mdt = av_metadata_get(md, "", mdt, AV_METADATA_IGNORE_SUFFIX)) != NULL)
#endif
fprintf(stderr, " -> %s = %s\n", mdt->key, mdt->value); fprintf(stderr, " -> %s = %s\n", mdt->key, mdt->value);
#endif #endif
@ -224,7 +236,11 @@ extract_metadata_core(struct media_file_info *mfi, AVMetadata *md, const struct
/* Extract actual metadata */ /* Extract actual metadata */
for (i = 0; md_map[i].key != NULL; i++) 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); mdt = av_metadata_get(md, md_map[i].key, NULL, 0);
#endif
if (mdt == NULL) if (mdt == NULL)
continue; continue;