SVN rev. 3034, trunk/gmerlin_avdecoder/lib/demux_ffmpeg.c misses ffmpeg
compat code, see attached patch.
--
Martin Matuska
FreeBSD committer
http://blog.vx.sk
Index: trunk/gmerlin_avdecoder/lib/demux_ffmpeg.c
===================================================================
--- trunk/gmerlin_avdecoder/lib/demux_ffmpeg.c (revision 3206)
+++ trunk/gmerlin_avdecoder/lib/demux_ffmpeg.c (working copy)
@@ -755,7 +755,7 @@
#define GET_METADATA_INT(gavl_name, ffmpeg_name) \
tag = av_metadata_get(avfc->metadata, ffmpeg_name, NULL, \
- AV_METADATA_IGNORE_SUFFIX); \
+5 AV_METADATA_IGNORE_SUFFIX); \
if(tag) \
gavl_metadata_set_int(&ctx->tt->cur->metadata, gavl_name,
atoi(tag->value));
@@ -774,15 +774,17 @@
/* Metadata */
if(avfc->title[0])
- ctx->tt->cur->metadata.title = bgav_strdup(avfc->title);
+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_TITLE, avfc->title);
if(avfc->author[0])
- ctx->tt->cur->metadata.author = bgav_strdup(avfc->author);
+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_AUTHOR, avfc->author);
if(avfc->copyright[0])
- ctx->tt->cur->metadata.copyright = bgav_strdup(avfc->copyright);
+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_COPYRIGHT,
avfc->copyright);
if(avfc->album[0])
- ctx->tt->cur->metadata.album = bgav_strdup(avfc->album);
+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_ALBUM, avfc->album);
if(avfc->genre[0])
- ctx->tt->cur->metadata.genre = bgav_strdup(avfc->genre);
+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_GENRE, avfc->genre);
+ if(avfc->track)
+ gavl_metadata_set_int(&ctx->tt->cur->metadata, GAVL_META_TRACKNUMBER,
avfc->track);
#endif
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Gmerlin-general mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gmerlin-general
