diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-01-09 12:01:22 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-01-09 12:01:22 +0000 |
| commit | ebd7f9bc697973366de8a6bf7265051e825e0680 (patch) | |
| tree | 1feb9df1c5fe3493e9aa1dd8f5d6233a38ae9d3c /src/plugins/Input/ffmpeg | |
| parent | bc7ad688c646afd2a89e5c5ff58696f2df2c8605 (diff) | |
| download | qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.gz qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.bz2 qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.zip | |
renaming experimental branch
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4675 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg')
| -rw-r--r-- | src/plugins/Input/ffmpeg/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpeg.pro | 17 |
3 files changed, 2 insertions, 26 deletions
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index b36645f98..615096abf 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -47,18 +47,10 @@ SET(libffmpeg_HDRS decoder_ffmpeg.h ) -SET(libffmpeg_MOC_HDRS - decoderffmpegfactory.h - ffmpegmetadatamodel.h - settingsdialog.h -) - SET(libffmpeg_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS}) -QT4_WRAP_CPP(libffmpeg_MOC_SRCS ${libffmpeg_MOC_HDRS}) - # user interface @@ -72,7 +64,7 @@ QT4_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FFMPEG_FOUND) -ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H} +ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) add_dependencies(ffmpeg qmmp) target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS}) diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 41ed21a8f..3e4304d89 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -112,6 +112,7 @@ bool DecoderFFmpeg::initialize() ic = avformat_alloc_context(); AVProbeData pd; + memset(&pd, 0, sizeof(pd)); uint8_t buf[PROBE_BUFFER_SIZE + AVPROBE_PADDING_SIZE]; pd.filename = m_path.toLocal8Bit().constData(); pd.buf_size = input()->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE); diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro index a1b0458d6..0897240ff 100644 --- a/src/plugins/Input/ffmpeg/ffmpeg.pro +++ b/src/plugins/Input/ffmpeg/ffmpeg.pro @@ -40,21 +40,4 @@ win32 { DEFINES += __STDC_CONSTANT_MACROS -TRANSLATIONS = translations/ffmpeg_plugin_ru.ts \ - translations/ffmpeg_plugin_uk_UA.ts \ - translations/ffmpeg_plugin_zh_CN.ts \ - translations/ffmpeg_plugin_zh_TW.ts \ - translations/ffmpeg_plugin_cs.ts \ - translations/ffmpeg_plugin_pl.ts \ - translations/ffmpeg_plugin_de.ts \ - translations/ffmpeg_plugin_it.ts \ - translations/ffmpeg_plugin_tr.ts \ - translations/ffmpeg_plugin_lt.ts \ - translations/ffmpeg_plugin_nl.ts \ - translations/ffmpeg_plugin_ja.ts \ - translations/ffmpeg_plugin_es.ts \ - translations/ffmpeg_plugin_sr_BA.ts \ - translations/ffmpeg_plugin_sr_RS.ts - RESOURCES = translations/translations.qrc - |