Skip to content

Commit

Permalink
Preparations for release 2.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkvdb committed Aug 18, 2016
1 parent 25e85c8 commit aa0dbe2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ install:
- sudo apt-get -qq install build-essential libpng-dev libjpeg-dev
- if [ "$CXX" = "g++" ]; then sudo apt-get -qq --allow-unauthenticated install gcc-4.9 g++-4.9; export CXX="g++-4.9" CC="gcc-4.9"; fi
- if [ "$CXX" = "clang++" ]; then sudo apt-get -qq --allow-unauthenticated install clang-3.6; export CXX="clang++-3.6" CC="clang-3.6"; fi
- wget http://ffmpeg.org/releases/ffmpeg-3.0.tar.bz2
- tar xf ffmpeg-3.0.tar.bz2
- cd ffmpeg-3.0 && ./configure --prefix=/usr --disable-static --enable-shared --disable-avdevice --disable-doc --disable-htmlpages --disable-manpages --disable-programs --disable-encoders --disable-muxers --enable-swscale --disable-yasm --enable-protocol=file --enable-protocol=http --enable-iconv && make -j4 && sudo make install
- wget http://ffmpeg.org/releases/ffmpeg-3.1.2.tar.bz2
- tar xf ffmpeg-3.1.2.tar.bz2
- cd ffmpeg-3.1.2 && ./configure --prefix=/usr --disable-static --enable-shared --disable-avdevice --disable-doc --disable-htmlpages --disable-manpages --disable-programs --disable-encoders --disable-muxers --enable-swscale --disable-yasm --enable-protocol=file --enable-protocol=http --enable-iconv && make -j4 && sudo make install
- cd ..

script:
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CMAKE_POLICY(VERSION 2.8)
SET(PACKAGE "ffmpegthumbnailer")
SET(PACKAGE_VERSION_MAJOR 2)
SET(PACKAGE_VERSION_MINOR 1)
SET(PACKAGE_VERSION_PATCH 1)
SET(PACKAGE_VERSION_PATCH 2)
SET(PACKAGE_VERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH})

SET(CPACK_PACKAGE_NAME ${PACKAGE})
Expand Down Expand Up @@ -160,7 +160,7 @@ IF (HAVE_PNG)
ENDIF ()

SET (FFMPEGTHUMBNAILER_SOVERSION_MAJOR 4)
SET (FFMPEGTHUMBNAILER_SOVERSION_MINOR 11)
SET (FFMPEGTHUMBNAILER_SOVERSION_MINOR 12)
SET (FFMPEGTHUMBNAILER_SOVERSION_PATCH 0)

ADD_DEFINITIONS("-D__STDC_CONSTANT_MACROS")
Expand Down
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
FFmpegThumbnailer 2.1.2
- Restored deinterlace functionality using the libavfilter library (additional ffmpeg dependency)
- Additional video mime types added to the thumbnailer file
- Take rotation metadata into account when generating thumbnails

FFmpegThumbnailer 2.1.1
- Buildable agains latest ffmpeg (currently breaks deinterlacing)
- Fallback when smart frame detection fails (thanks to johnnydeez)
Expand Down

0 comments on commit aa0dbe2

Please sign in to comment.