# HG changeset patch

# User Mathieu Schroeter <mathieu@schroetersa.ch>

# Date 1332952787 -7200

# Node ID d5dc3dc95d6225f440e1cffad125763c712adf3e

# Parent  6f9d0738d006544e5d2493907b190aa5e3e38c9b

drop the old avformat stuff for metadata and use avdict instead

diff -r 6f9d0738d006 -r d5dc3dc95d62 src/parser.c

--- a/src/parser.c	Wed Mar 28 18:27:47 2012 +0200

+++ b/src/parser.c	Wed Mar 28 18:39:47 2012 +0200

@@ -284,7 +284,7 @@

   unsigned int i;

   metadata_t *meta = NULL;

   const metadata_t *title_tag = NULL;

-  AVMetadataTag *tag = NULL;

+  AVDictionaryEntry *tag = NULL;

   const metadata_plist_t pl = {

     .metadata = NULL,

     .priority = VALHALLA_METADATA_PL_HIGHEST

@@ -293,20 +293,14 @@

   if (!ctx)

     return NULL;

-#if LIBAVFORMAT_VERSION_MAJOR < 53

-  av_metadata_conv (ctx, NULL, ctx->iformat->metadata_conv);

-#endif /* LIBAVFORMAT_VERSION_MAJOR < 53 */

-

-  while ((tag = av_metadata_get (ctx->metadata,

-                                 "", tag, AV_METADATA_IGNORE_SUFFIX)))

+  while ((tag = av_dict_get (ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))

     vh_metadata_add_auto (&meta, tag->key, tag->value,

                           VALHALLA_LANG_UNDEF, &pl);

   for (i = 0; i < ctx->nb_streams; i++)

   {

     AVStream *st = ctx->streams[i];

-    while ((tag = av_metadata_get (st->metadata,

-                                   "", tag, AV_METADATA_IGNORE_SUFFIX)))

+    while ((tag = av_dict_get (st->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))

     {

       const char *key = tag->key;