diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-05-05 19:51:23 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-05-05 19:51:23 +0000 |
| commit | ce1c3cb1184f00dfc945e00b3d022837c673094e (patch) | |
| tree | 44d5178c768aa83b62f1a3877dd9d6a45d6ac3c7 | |
| parent | 2faa2a81d95386298aa5a41b9d75a1f0b3a1f077 (diff) | |
| download | qmmp-ce1c3cb1184f00dfc945e00b3d022837c673094e.tar.gz qmmp-ce1c3cb1184f00dfc945e00b3d022837c673094e.tar.bz2 qmmp-ce1c3cb1184f00dfc945e00b3d022837c673094e.zip | |
removed obsolete memalig function
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1710 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/ffmpeg/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpeg.pro | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 523b3d2f9..24991e45b 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -28,7 +28,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libffmpeg -pkg_check_modules(FFMPEG libavcodec libavformat) +pkg_check_modules(FFMPEG libavcodec libavformat libavutil) # old ffmpeg support @@ -43,6 +43,7 @@ ELSEIF(EXISTS /usr/include/libavformat/avformat.h) ELSE(EXISTS /usr/include/ffmpeg/libavformat/avformat.h) include_directories(/usr/local/include/ffmpeg /usr/local/include/libavformat + /usr/local/include/libavutil ) ENDIF(EXISTS /usr/include/ffmpeg/libavformat/avformat.h) @@ -56,6 +57,7 @@ ELSEIF(EXISTS /usr/include/libavcodec/avcodec.h) ELSE(EXISTS /usr/include/ffmpeg/libavcodec/avcodec.h) include_directories(/usr/local/include/ffmpeg /usr/local/include/libavcodec + /usr/local/include/libavutil ) ENDIF(EXISTS /usr/include/ffmpeg/libavcodec/avcodec.h) diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 1d8c9476f..03e86c636 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -92,7 +92,7 @@ DecoderFFmpeg::~DecoderFFmpeg() if(m_pkt.data) av_free_packet(&m_pkt); if(m_output_buf) - free(m_output_buf); + av_free(m_output_buf); } bool DecoderFFmpeg::initialize() @@ -170,7 +170,7 @@ bool DecoderFFmpeg::initialize() } m_totalTime = input()->isSequential() ? 0 : ic->duration * 1000 / AV_TIME_BASE; - m_output_buf = (uint8_t *)memalign(16, AVCODEC_MAX_AUDIO_FRAME_SIZE * 3 / 2 + QMMP_BUFFER_SIZE); + m_output_buf = (uint8_t *)av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3 / 2 + QMMP_BUFFER_SIZE); configure(c->sample_rate, c->channels, Qmmp::PCM_S16LE); m_bitrate = c->bit_rate; diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro index e1f093749..5dc9b46e1 100644 --- a/src/plugins/Input/ffmpeg/ffmpeg.pro +++ b/src/plugins/Input/ffmpeg/ffmpeg.pro @@ -14,8 +14,10 @@ QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg.so INCLUDEPATH += ../../../ INCLUDEPATH += /usr/include/libavformat INCLUDEPATH += /usr/include/libavcodec +INCLUDEPATH += /usr/include/libavutil INCLUDEPATH += /usr/include/ffmpeg/libavcodec INCLUDEPATH += /usr/include/ffmpeg/libavformat +INCLUDEPATH += /usr/include/ffmpeg/libavutil INCLUDEPATH += /usr/include/ffmpeg CONFIG += release \ warn_on \ @@ -28,7 +30,8 @@ LIBS += -lqmmp \ -I/usr/include \ -I/usr/include/ffmpeg \ -I/usr/include/libavcodec \ - -I/usr/include/libavformat + -I/usr/include/libavformat \ + -I/usr/include/libavutil DEFINES += __STDC_CONSTANT_MACROS PKGCONFIG += libavcodec libavformat libavutil TRANSLATIONS = translations/ffmpeg_plugin_ru.ts \ |