diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-26 00:37:04 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-26 01:17:43 +0100 |
| commit | ba49f20f685d7e6d25fcbf2af60d389fedc67210 (patch) | |
| tree | af00916b85a20bbff10b3e6863f4498300aeb4ca /src/decoder/FfmpegMetaData.cxx | |
| parent | a3ee26da6437dff2d065cc3fc2ad069447309ab6 (diff) | |
| download | mpd-ba49f20f685d7e6d25fcbf2af60d389fedc67210.tar.gz mpd-ba49f20f685d7e6d25fcbf2af60d389fedc67210.tar.xz mpd-ba49f20f685d7e6d25fcbf2af60d389fedc67210.zip | |
decoder/ffmpeg: convert to C++
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/FfmpegMetaData.cxx (renamed from src/decoder/ffmpeg_metadata.c) | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/decoder/ffmpeg_metadata.c b/src/decoder/FfmpegMetaData.cxx index 3ef774f63..d3000591c 100644 --- a/src/decoder/ffmpeg_metadata.c +++ b/src/decoder/FfmpegMetaData.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -17,8 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* necessary because libavutil/common.h uses UINT64_C */ +#define __STDC_CONSTANT_MACROS + #include "config.h" -#include "ffmpeg_metadata.h" +#include "FfmpegMetaData.hxx" #include "tag_table.h" #include "tag_handler.h" @@ -70,7 +73,7 @@ ffmpeg_scan_dictionary(AVDictionary *dict, const struct tag_handler *handler, void *handler_ctx) { for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i) - ffmpeg_copy_metadata(i, dict, tag_item_names[i], + ffmpeg_copy_metadata(tag_type(i), dict, tag_item_names[i], handler, handler_ctx); for (const struct tag_table *i = ffmpeg_tags; |