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/ffmpeg_metadata.h | |
| 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.hxx (renamed from src/decoder/ffmpeg_metadata.h) | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/decoder/ffmpeg_metadata.h b/src/decoder/FfmpegMetaData.hxx index 60658f479..f76e16287 100644 --- a/src/decoder/ffmpeg_metadata.h +++ b/src/decoder/FfmpegMetaData.hxx @@ -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,14 +17,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_FFMPEG_METADATA_H -#define MPD_FFMPEG_METADATA_H +#ifndef MPD_FFMPEG_METADATA_HXX +#define MPD_FFMPEG_METADATA_HXX +extern "C" { #include <libavformat/avformat.h> #include <libavutil/avutil.h> #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0) #include <libavutil/dict.h> #endif +} #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,1,0) #define AVDictionary AVMetadata |