From kde-commits Tue May 11 21:24:13 2010 From: Andreas Scherf Date: Tue, 11 May 2010 21:24:13 +0000 To: kde-commits Subject: KDE/kdemultimedia Message-Id: <20100511212413.CE85DAC8B3 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=127361277612903 SVN commit 1125637 by scherfa: Added ffmpegthumbs. A fast and light videothumbnailer which could replace mplayerthumbs. M +8 -0 CMakeLists.txt A ffmpegthumbs (directory) A ffmpegthumbs/CMakeLists.txt A ffmpegthumbs/ffmpegthumbnailer (directory) A ffmpegthumbs/ffmpegthumbnailer.cpp [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer.h [License: GPL (v2+) (wrong address)] AM ffmpegthumbs/ffmpegthumbnailer/AUTHORS A ffmpegthumbs/ffmpegthumbnailer/ChangeLog AM ffmpegthumbs/ffmpegthumbnailer/README A ffmpegthumbs/ffmpegthumbnailer/filmstripfilter.cpp [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/filmstripfilter.h [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/histogram.h [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/ifilter.h [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/imagewriter.cpp [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/imagewriter.h [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/moviedecoder.h [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/videoframe.h [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.cpp [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.h [License: GPL (v2+) (wrong address)] A ffmpegthumbs/ffmpegthumbs.desktop A ffmpegthumbs/tests (directory) A ffmpegthumbs/tests/CMakeLists.txt A ffmpegthumbs/tests/ffmpegthumbtest.cpp [License: GPL (v2+) (wrong address)] --- trunk/KDE/kdemultimedia/CMakeLists.txt #1125636:1125637 @@ -17,6 +17,10 @@ alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) +macro_optional_find_package(FFmpeg) +macro_log_feature(FFMPEG_FOUND "FFmpeg" "FFmpeg libraries" "FFmpeg" FALSE "http://www.ffmpeg.org" "FFmpeg required for FFMpegVideoPreview backend") +macro_log_feature(SWSCALE_FOUND "swscale" "FFmpeg video scaling libraries" "swscale" FALSE "" "swscale required for FFMpegVideoPreview backend") + macro_optional_find_package(Xine) macro_log_feature(XINE_XCB_FOUND "Xine XCB" "Xine libraries" "http://www.xine-project.org/" FALSE "" "Xine and phonon-xine must be compiled with XCB support.") @@ -39,6 +43,10 @@ add_subdirectory(libkcompactdisc) add_subdirectory(mplayerthumbs) +if (FFMPEG_FOUND AND SWSCALE_FOUND) + macro_optional_add_subdirectory(ffmpegthumbs) +endif (FFMPEG_FOUND AND SWSCALE_FOUND) + if (TAGLIB_FOUND) macro_optional_add_subdirectory(juk) endif(TAGLIB_FOUND)