diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2013-08-02 10:27:10 -0400 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-06 10:18:38 -0400 |
| commit | 4abf69d91614b1607406c736c568abcc7522095c (patch) | |
| tree | 8df23727555438260405b65679a88007a7aa85e9 | |
| parent | a4a68d2a9acec6ac971a4115a65a6f65df09ff5f (diff) | |
DVDOverlayCodecText: Remove libav compat #ifery and move it to libav_hacks.h
| -rw-r--r-- | lib/xbmc-libav-hacks/libav_hacks.h | 1 | ||||
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/xbmc-libav-hacks/libav_hacks.h b/lib/xbmc-libav-hacks/libav_hacks.h index a828850761..bf3ab7bae1 100644 --- a/lib/xbmc-libav-hacks/libav_hacks.h +++ b/lib/xbmc-libav-hacks/libav_hacks.h @@ -41,6 +41,7 @@ #define AVFRAME_IN_LAVU #define AV_CODEC_ID_OTF AV_CODEC_ID_TTF +#define AV_CODEC_ID_SUBRIP AV_CODEC_ID_TEXT AVDictionary *av_frame_get_metadata (const AVFrame *frame); diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp index 263496eedf..af4eaac826 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp @@ -44,13 +44,8 @@ bool CDVDOverlayCodecText::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options m_bIsSSA = (hints.codec == AV_CODEC_ID_SSA); if(hints.codec == AV_CODEC_ID_TEXT || hints.codec == AV_CODEC_ID_SSA) return true; -#if defined(LIBAVCODEC_FROM_FFMPEG) && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,53,100) - // API changed in: - // ffmpeg: commit 2626cc4580bfd560c6983338d77b2c11c16af94f (11 Aug 2012) - // release 1.0 (28 Sept 2012) if(hints.codec == AV_CODEC_ID_SUBRIP) return true; -#endif return false; } |