really purge libav

pcbeard · Nov 12, 2015 · 3ea3d07 · 3ea3d07
1 parent 39f89f9
commit 3ea3d07
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 261 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,22 +107,11 @@ unset(FFMPEG_LIBRARIES CACHE)
 
 find_package(FFmpeg REQUIRED)
 
-set (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARY})
+set (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARY} ${SWRESAMPLE_LIBRARIES})
 
-if ( NOT AVCODEC_FOUND OR NOT AVFORMAT_FOUND OR NOT AVUTIL_FOUND OR NOT SWSCALE_FOUND )
+if ( NOT AVCODEC_FOUND OR NOT AVFORMAT_FOUND OR NOT AVUTIL_FOUND OR NOT SWSCALE_FOUND OR NOT SWRESAMPLE_FOUND)
     message(FATAL_ERROR "FFmpeg component required, but not found!")
 endif()
-set(SOUND_INPUT_INCLUDES ${FFMPEG_INCLUDE_DIRS})
-if( SWRESAMPLE_FOUND )
-    add_definitions(-DHAVE_LIBSWRESAMPLE)
-    set (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${SWRESAMPLE_LIBRARIES})
-else()
-    if( AVRESAMPLE_FOUND )
-        set (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${AVRESAMPLE_LIBRARIES})
-    else()
-        message(FATAL_ERROR "Install either libswresample (FFmpeg) or libavresample (Libav).")
-    endif()
-endif()
 # Required for building the FFmpeg headers
 add_definitions(-D__STDC_CONSTANT_MACROS)
 

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwscript
     )
 
 add_openmw_dir (mwsound
-    soundmanagerimp openal_output ffmpeg_decoder sound sound_decoder sound_output loudness libavwrapper movieaudiofactory
+    soundmanagerimp openal_output ffmpeg_decoder sound sound_decoder sound_output loudness movieaudiofactory
     )
 
 add_openmw_dir (mwworld

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -6,16 +6,6 @@
 #include <stdexcept>
 #include <sstream>
 
-extern "C" {
-#ifndef HAVE_LIBSWRESAMPLE
-// FIXME: remove this section once libswresample is packaged for Debian
-int  swr_init(AVAudioResampleContext *avr);
-void  swr_free(AVAudioResampleContext **avr);
-int swr_convert( AVAudioResampleContext *avr, uint8_t** output, int out_samples, const uint8_t** input, int in_samples);
-AVAudioResampleContext * swr_alloc_set_opts( AVAudioResampleContext *avr, int64_t out_ch_layout, AVSampleFormat out_fmt, int out_rate, int64_t in_ch_layout, AVSampleFormat in_fmt, int in_rate, int o, void* l);
-#endif
-}
-
 #include <components/vfs/manager.hpp>
 
 namespace MWSound

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -22,13 +22,7 @@ extern "C"
 // From version 54.56 binkaudio encoding format changed from S16 to FLTP. See:
 // https://gitorious.org/ffmpeg/ffmpeg/commit/7bfd1766d1c18f07b0a2dd042418a874d49ea60d
 // http://ffmpeg.zeranoe.com/forum/viewtopic.php?f=15&t=872
-#ifdef HAVE_LIBSWRESAMPLE
 #include <libswresample/swresample.h>
-#else
-#include <libavresample/avresample.h>
-#include <libavutil/opt.h>
-#define SwrContext AVAudioResampleContext
-#endif
 }
 
 #include <components/files/constrainedfilestream.hpp>

diff --git a/apps/openmw/mwsound/libavwrapper.cpp b/apps/openmw/mwsound/libavwrapper.cpp
diff --git a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
@@ -6,7 +6,6 @@ set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
     videoplayer.cpp
     videostate.cpp
     videodefs.hpp
-    libavwrapper.cpp
     audiodecoder.cpp
     audiofactory.hpp
 )

diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp
@@ -6,24 +6,12 @@ extern "C"
 
     #include <libavcodec/avcodec.h>
 
-    #ifdef HAVE_LIBSWRESAMPLE
     #include <libswresample/swresample.h>
-    #else
-    // FIXME: remove this section once libswresample is packaged for Debian
-    #include <libavresample/avresample.h>
-    #include <libavutil/opt.h>
-    #define SwrContext AVAudioResampleContext
-    int  swr_init(AVAudioResampleContext *avr);
-    void  swr_free(AVAudioResampleContext **avr);
-    int swr_convert( AVAudioResampleContext *avr, uint8_t** output, int out_samples, const uint8_t** input, int in_samples);
-    AVAudioResampleContext * swr_alloc_set_opts( AVAudioResampleContext *avr, int64_t out_ch_layout, AVSampleFormat out_fmt, int out_rate, int64_t in_ch_layout, AVSampleFormat in_fmt, int in_rate, int o, void* l);
-    #endif
 
     #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)
     #define av_frame_alloc  avcodec_alloc_frame
     #endif
 
-
 }
 
 #include "videostate.hpp"

diff --git a/extern/osg-ffmpeg-videoplayer/libavwrapper.cpp b/extern/osg-ffmpeg-videoplayer/libavwrapper.cpp