Packman Build Service PMBS

libde265.changes Changed

libde265.spec Changed

libde265-disable_tools.patch Changed

@@ -1,38 +1,15 @@
-Description: Disable building of some internal tools that no longer link
- because internal symbols are not exported.
-Author: Joachim Bauch <bauch@struktur.de>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,10 +8,6 @@
- SUBDIRS+=dec265
- endif
+--- libde265-orig/Makefile.am	2020-04-06 17:52:29.260908356 +0200
++++ libde265-patched/Makefile.am	2020-04-06 17:53:20.796824123 +0200
+@@ -10,10 +10,9 @@
  
--SUBDIRS+=enc265
--SUBDIRS+=tools
--SUBDIRS+=acceleration-speed
+ if ENABLE_ENCODER
+ SUBDIRS+=enc265
+-endif
 -
+ SUBDIRS+=tools
+ SUBDIRS+=acceleration-speed
++endif
+ 
  if ENABLE_SHERLOCK265
  SUBDIRS+=sherlock265
- endif
---- a/dec265/Makefile.am
-+++ b/dec265/Makefile.am
-@@ -1,5 +1,5 @@
- 
--bin_PROGRAMS = dec265 hdrcopy
-+bin_PROGRAMS = dec265
- 
- AM_CPPFLAGS = -I../libde265
- 
-@@ -9,12 +9,6 @@
- dec265_LDADD = ../libde265/libde265.la -lstdc++
- dec265_SOURCES = dec265.cc
- 
--hdrcopy_DEPENDENCIES = ../libde265/libde265.la
--hdrcopy_CXXFLAGS =
--hdrcopy_LDFLAGS =
--hdrcopy_LDADD = ../libde265/libde265.la -lstdc++
--hdrcopy_SOURCES = hdrcopy.cc
--
- if HAVE_VIDEOGFX
-   dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
-   dec265_LDFLAGS += $(VIDEOGFX_LIBS)
+

libde265-only_export_decoder_api.patch Deleted

@@ -1,286 +0,0 @@
-Description: Only export symbols defined in the decoder API.
- The encoder API is not final yet, so upstream exports all symbols to make
- development easier. For packaging we only want to expose the public API.
-Author: Joachim Bauch <bauch@struktur.de>
---- a/libde265/encoder/Makefile.am
-+++ b/libde265/encoder/Makefile.am
-@@ -10,6 +10,18 @@
-   encpicbuf.h encpicbuf.cc \
-   sop.h sop.cc
- 
-+libde265_encoder_la_CFLAGS = \
-+  $(CFLAG_VISIBILITY) \
-+  -DLIBDE265_EXPORTS
-+libde265_encoder_la_CXXFLAGS += \
-+  $(CFLAG_VISIBILITY) \
-+  -DLIBDE265_EXPORTS
-+
-+if HAVE_VISIBILITY
-+ libde265_encoder_la_CFLAGS += -DHAVE_VISIBILITY
-+ libde265_encoder_la_CXXFLAGS += -DHAVE_VISIBILITY
-+endif
-+
- SUBDIRS=algo
- libde265_encoder_la_LIBADD = algo/libde265_encoder_algo.la
- 
---- a/libde265/encoder/algo/Makefile.am
-+++ b/libde265/encoder/algo/Makefile.am
-@@ -17,5 +17,13 @@
-   tb-rateestim.h tb-rateestim.cc \
-   pb-mv.h pb-mv.cc
- 
-+libde265_encoder_algo_la_CXXFLAGS += \
-+  $(CFLAG_VISIBILITY) \
-+  -DLIBDE265_EXPORTS
-+
-+if HAVE_VISIBILITY
-+ libde265_encoder_algo_la_CXXFLAGS += -DHAVE_VISIBILITY
-+endif
-+
- EXTRA_DIST = \
-   CMakeLists.txt
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,9 +50,7 @@
- fi
- changequote([,])dnl
- 
--dnl gl_VISIBILITY
--dnl : In encoder branch, we still export all library symbols :
--HAVE_VISIBILITY=0
-+gl_VISIBILITY
- AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" != "x0"])
- 
- # Checks for header files.
---- a/libde265/image-io.cc
-+++ b/libde265/image-io.cc
-@@ -183,7 +183,7 @@
- }
- 
- 
--LIBDE265_API PacketSink_File::~PacketSink_File()
-+PacketSink_File::~PacketSink_File()
- {
-   if (mFH) {
-     fclose(mFH);
-@@ -191,7 +191,7 @@
- }
- 
- 
--LIBDE265_API void PacketSink_File::set_filename(const char* filename)
-+void PacketSink_File::set_filename(const char* filename)
- {
-   assert(mFH==NULL);
- 
-@@ -199,7 +199,7 @@
- }
- 
- 
--LIBDE265_API void PacketSink_File::send_packet(const uint8_t* data, int n)
-+void PacketSink_File::send_packet(const uint8_t* data, int n)
- {
-   uint8_t startCode[3];
-   startCode[0] = 0;
---- a/libde265/image-io.h
-+++ b/libde265/image-io.h
-@@ -30,17 +30,17 @@
- class ImageSource
- {
-  public:
--  LIBDE265_API ImageSource();
--  virtual LIBDE265_API ~ImageSource() { }
-+  ImageSource();
-+  virtual ~ImageSource() { }
- 
-   //enum ImageStatus { Available, Waiting, EndOfVideo };
- 
-   //virtual ImageStatus  get_status() = 0;
--  virtual LIBDE265_API de265_image* get_image(bool block=true) = 0;
--  virtual LIBDE265_API void skip_frames(int n) = 0;
-+  virtual de265_image* get_image(bool block=true) = 0;
-+  virtual void skip_frames(int n) = 0;
- 
--  virtual LIBDE265_API int get_width() const = 0;
--  virtual LIBDE265_API int get_height() const = 0;
-+  virtual int get_width() const = 0;
-+  virtual int get_height() const = 0;
- };
- 
- 
-@@ -48,17 +48,17 @@
- class ImageSource_YUV : public ImageSource
- {
-  public:
--  LIBDE265_API ImageSource_YUV();
--  virtual LIBDE265_API ~ImageSource_YUV();
-+  ImageSource_YUV();
-+  virtual ~ImageSource_YUV();
- 
--  bool LIBDE265_API set_input_file(const char* filename, int w,int h);
-+  bool set_input_file(const char* filename, int w,int h);
- 
-   //virtual ImageStatus  get_status();
--  virtual LIBDE265_API de265_image* get_image(bool block=true);
--  virtual LIBDE265_API void skip_frames(int n);
-+  virtual de265_image* get_image(bool block=true);
-+  virtual void skip_frames(int n);
- 
--  virtual LIBDE265_API int get_width() const { return width; }
--  virtual LIBDE265_API int get_height() const { return height; }
-+  virtual int get_width() const { return width; }
-+  virtual int get_height() const { return height; }
- 
-  private:
-   FILE* mFH;
-@@ -74,20 +74,20 @@
- class ImageSink
- {
-  public:
--  virtual LIBDE265_API ~ImageSink() { }
-+  virtual ~ImageSink() { }
- 
--  virtual LIBDE265_API void send_image(const de265_image* img) = 0;
-+  virtual void send_image(const de265_image* img) = 0;
- };
- 
- class ImageSink_YUV : public ImageSink
- {
-  public:
-- LIBDE265_API ImageSink_YUV() : mFH(NULL) { }
--  LIBDE265_API ~ImageSink_YUV();
-+  ImageSink_YUV() : mFH(NULL) { }
-+  ~ImageSink_YUV();
- 
--  bool LIBDE265_API set_filename(const char* filename);
-+  bool set_filename(const char* filename);
- 
--  virtual LIBDE265_API void send_image(const de265_image* img);
-+  virtual void send_image(const de265_image* img);
- 
-  private:
-   FILE* mFH;
-@@ -98,21 +98,21 @@
- class PacketSink
- {
-  public:
--  virtual LIBDE265_API ~PacketSink() { }
-+  virtual ~PacketSink() { }
- 
--  virtual LIBDE265_API void send_packet(const uint8_t* data, int n) = 0;
-+  virtual void send_packet(const uint8_t* data, int n) = 0;
- };
- 
- 
- class PacketSink_File : public PacketSink
- {
-  public:
--  LIBDE265_API PacketSink_File();
--  virtual LIBDE265_API ~PacketSink_File();
-+  PacketSink_File();
-+  virtual ~PacketSink_File();
- 
--  LIBDE265_API void set_filename(const char* filename);
-+  void set_filename(const char* filename);
- 
--  virtual LIBDE265_API void send_packet(const uint8_t* data, int n);
-+  virtual void send_packet(const uint8_t* data, int n);
- 
-  private:
-   FILE* mFH;
---- a/libde265/configparam.h
-+++ b/libde265/configparam.h
-@@ -95,7 +95,7 @@
-   bool hasLongOption() const { return true; } //mLongOption!=NULL; }
-   std::string getLongOption() const { return mLongOption ? std::string(mLongOption) : get_name(); }
- 
--  virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx) { return false; }
-+  virtual bool processCmdLineArguments(char** argv, int* argc, int idx) { return false; }
- 
-

libde265-use_new_FFMPEG_enum_names.patch Deleted

libde265-1.0.3.tar.gz/libde265-1.0.2 Deleted

libde265-1.0.3.tar.gz/libde265-1.0.2/COPYING Deleted

@@ -1,853 +0,0 @@
-The library `libde265` is distributed under the terms of the GNU Lesser
-General Public License. The sample applications are distributed under
-the terms of the GNU General Public License.
-
-License texts below and in the `COPYING` files of the corresponding
-subfolders.
-
-----------------------------------------------------------------------
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-----------------------------------------------------------------------
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not

libde265-1.0.3.tar.gz/.travis.yml -> libde265-1.0.5.tar.gz/.travis.yml Changed

@@ -3,6 +3,11 @@
 language: cpp
 compiler:
   - gcc
+dist: trusty
+cache: ccache
+addons:
+  apt:
+    update: true
 env:
   - HOST= WINE= DECODESTREAMS=
   - HOST=i686-w64-mingw32 WINE=wine DECODESTREAMS=
@@ -28,6 +33,15 @@
   include:
     - compiler: clang
       env: HOST= WINE= DECODESTREAMS=
+    - os: osx
+      compiler: clang
+      env: HOST= WINE= DECODESTREAMS=
+    - os: osx
+      compiler: gcc
+      env: HOST= WINE= DECODESTREAMS=
+    - os: osx
+      compiler: gcc
+      env: HOST=cmake WINE= DECODESTREAMS=
   allow_failures:
     - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-fuzzing THREADING=
     - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-fuzzing THREADING=--single-threaded
@@ -45,45 +59,13 @@
     - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-wpp-nolf THREADING=--single-threaded
 
 before_install:
-  - sh -c "if [ ! -z '$DECODESTREAMS' ]; then sudo add-apt-repository -y ppa:strukturag/libde265; fi"
-  - sudo apt-get update -qq
-  - sh -c "if [ -z '$HOST' ]; then sudo apt-get install -qq valgrind libsdl-dev libqt4-dev libswscale-dev; fi"
-  - sh -c "if [ -z '$HOST' ] && [ -z '$DECODESTREAMS' ]; then sudo apt-get install -qq devscripts; fi"
-  - sh -c "if [ ! -z '$WINE' ]; then sudo apt-get install -qq wine; fi"
-  - sh -c "if [ '$WINE' = 'wine'   ]; then sudo apt-get install -qq gcc-mingw-w64-i686   g++-mingw-w64-i686   binutils-mingw-w64-i686   mingw-w64-i686-dev; fi"
-  - sh -c "if [ '$WINE' = 'wine64' ]; then sudo apt-get install -qq gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-x86-64-dev; fi"
-  - sh -c "if ( echo '$HOST' | grep -q '^arm' ); then sudo apt-get install -qq g++-arm-linux-gnueabihf gcc-arm-linux-gnueabihf qemu-user; fi"
-  - sh -c "if [ ! -z '$DECODESTREAMS' ]; then sudo apt-get install $DECODESTREAMS; fi"
-  - sudo apt-get install cmake
+  - ./scripts/ci-before-install-$TRAVIS_OS_NAME.sh
 
 install:
   - git clone https://github.com/strukturag/libde265-data.git
 
 before_script:
-  - if [ "$HOST" != "cmake" ]; then ./autogen.sh; fi
-  - if [ ! -z "$HOST" ] && [ "$HOST" != "cmake" ]; then unset CC; fi
-  - if [ ! -z "$HOST" ] && [ "$HOST" != "cmake" ]; then unset CXX; fi
-  - if [ "$HOST" != "cmake" ]; then ./configure --host=$HOST; fi
-  - if [ "$HOST" = "cmake" ]; then cmake .; fi
-
-# inter-streams are valgrinded without SSE, because it gives too many false positives in put_hevc_qpel()
-# intra-streams use SSE, because they run fine in valgrind
+  - ./scripts/ci-before-script.sh
 
 script:
-  - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then ./scripts/check_licenses.sh; fi"
-  - make
-  - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then make dist && mkdir dist-test && cd dist-test && tar xzf ../libde265-*.tar.gz && cd libde265-* && ./configure && make; fi"
-  - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then make dist && mkdir dist-cmake-test && cd dist-cmake-test && tar xzf ../libde265-*.tar.gz && cd libde265-* && cmake . && make; fi"
-  - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 --gen-suppressions=all --suppressions=valgrind.supp ./dec265/.libs/dec265 -q -c -f 100 ./libde265-data/IDR-only/paris-352x288-intra.bin; fi"
-  - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 --gen-suppressions=all --suppressions=valgrind.supp ./dec265/.libs/dec265 -t 4 -q -c -f 100 ./libde265-data/IDR-only/paris-352x288-intra.bin; fi"
-  - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 --gen-suppressions=all --suppressions=valgrind.supp ./dec265/.libs/dec265 -0 -q -c -f 100 ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi"
-  - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 --gen-suppressions=all --suppressions=valgrind.supp ./dec265/.libs/dec265 -0 -t 4 -q -c -f 100 ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi"
-  - sh -c "if [ ! -z "$WINE" ]; then WINEPREFIX=`pwd`/$WINE WINEPATH=\"/usr/lib/gcc/$HOST/4.8/\;/usr/$HOST/lib\" $WINE ./dec265/dec265.exe -q -c ./libde265-data/IDR-only/paris-352x288-intra.bin; fi"
-  - sh -c "if [ ! -z "$WINE" ]; then WINEPREFIX=`pwd`/$WINE WINEPATH=\"/usr/lib/gcc/$HOST/4.8/\;/usr/$HOST/lib\" $WINE ./dec265/dec265.exe -t 4 -q -c ./libde265-data/IDR-only/paris-352x288-intra.bin; fi"
-  - sh -c "if [ ! -z "$WINE" ]; then WINEPREFIX=`pwd`/$WINE WINEPATH=\"/usr/lib/gcc/$HOST/4.8/\;/usr/$HOST/lib\" $WINE ./dec265/dec265.exe -q -c ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi"
-  - sh -c "if [ ! -z "$WINE" ]; then WINEPREFIX=`pwd`/$WINE WINEPATH=\"/usr/lib/gcc/$HOST/4.8/\;/usr/$HOST/lib\" $WINE ./dec265/dec265.exe -t 4 -q -c ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi"
-  - sh -c "if ( echo '$HOST' | grep -q '^arm' ); then LD_LIBRARY_PATH=`pwd`/libde265/.libs/ qemu-arm -L /usr/$HOST ./dec265/.libs/dec265 -q -c ./libde265-data/IDR-only/paris-352x288-intra.bin; fi"
-  #- sh -c "if ( echo '$HOST' | grep -q '^arm' ); then LD_LIBRARY_PATH=`pwd`/libde265/.libs/ qemu-arm -L /usr/$HOST ./dec265/.libs/dec265 -t 4 -q -c ./libde265-data/IDR-only/paris-352x288-intra.bin; fi"
-  - sh -c "if ( echo '$HOST' | grep -q '^arm' ); then LD_LIBRARY_PATH=`pwd`/libde265/.libs/ qemu-arm -L /usr/$HOST ./dec265/.libs/dec265 -q -c ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi"
-  #- sh -c "if ( echo '$HOST' | grep -q '^arm' ); then LD_LIBRARY_PATH=`pwd`/libde265/.libs/ qemu-arm -L /usr/$HOST ./dec265/.libs/dec265 -t 4 -q -c ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi"
-  - sh -c "if [ ! -z '$DECODESTREAMS' ]; then python scripts/decodestreams.py $THREADING /var/lib/libde265-teststreams; fi"
+  - ./scripts/ci-run.sh

libde265-1.0.3.tar.gz/CMakeLists.txt -> libde265-1.0.5.tar.gz/CMakeLists.txt Changed

@@ -1,18 +1,32 @@
-project (libde265)
-cmake_minimum_required (VERSION 2.8.8)
+cmake_minimum_required (VERSION 3.3.2)
+
+project (libde265
+    LANGUAGES C CXX
+    VERSION 1.0.5
+)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # The version number.
-set (NUMERIC_VERSION 0x01000000)
-set (PACKAGE_VERSION 1.0.0)
+set (NUMERIC_VERSION 0x01000500)
+set (PACKAGE_VERSION ${PROJECT_VERSION})
 
 include (${CMAKE_ROOT}/Modules/CheckCCompilerFlag.cmake)
 include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-include (${CMAKE_ROOT}/Modules/FindSDL.cmake)
-include (${CMAKE_ROOT}/Modules/FindThreads.cmake)
+
+include(GNUInstallDirs)
+include(CheckFunctionExists)
+
+find_package(SDL)
+find_package(Threads REQUIRED)
 
 CHECK_INCLUDE_FILE(malloc.h HAVE_MALLOC_H)
 CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
 CHECK_INCLUDE_FILE(stdbool.h HAVE_STDBOOL_H)
+CHECK_FUNCTION_EXISTS(posix_memalign HAVE_POSIX_MEMALIGN)
 
 if (HAVE_MALLOC_H)
   add_definitions(-DHAVE_MALLOC_H)
@@ -23,19 +37,14 @@
 if (HAVE_STDBOOL_H)
   add_definitions(-DHAVE_STDBOOL_H)
 endif()
+if (HAVE_POSIX_MEMALIGN)
+  add_definitions(-DHAVE_POSIX_MEMALIGN)
+endif()
 
-configure_file (
-  "${PROJECT_SOURCE_DIR}/libde265/de265-version.h.in"
-  "${PROJECT_BINARY_DIR}/libde265/de265-version.h"
-)
+configure_file (libde265/de265-version.h.in libde265/de265-version.h)
 
-if(CMAKE_COMPILER_IS_GNUCXX)
-  set(GCC 1)
-  add_definitions(-Wall)
-  set(CMAKE_CXX_FLAGS "-std=gnu++0x ${CMAKE_CXX_FLAGS}")
-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   add_definitions(-Wall)
-  set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
 endif()
 
 option(DISABLE_SSE "Disable SSE optimizations")
@@ -54,13 +63,6 @@
   include_directories ("${PROJECT_SOURCE_DIR}/extra")
   add_definitions(-DHAVE_STDINT_H)
   add_definitions(-DHAVE_STDBOOL_H)
-  add_definitions(-DNOMINMAX)
-endif()
-
-if(UNIX)
-  set(LIBDE265_LIBRARY_NAME de265)
-else()
-  set(LIBDE265_LIBRARY_NAME libde265)
 endif()
 
 add_subdirectory (libde265)

libde265-1.0.3.tar.gz/COPYING -> libde265-1.0.5.tar.gz/COPYING Changed

@@ -1,9 +1,7 @@
-The library `libde265` is distributed under the terms of the GNU Lesser
-General Public License. The sample applications are distributed under
-the terms of the GNU General Public License.
+* The library `libde265` is distributed under the terms of the GNU Lesser General Public License.
+* The sample applications are distributed under the terms of the MIT license.
 
-License texts below and in the `COPYING` files of the corresponding
-subfolders.
+License texts below and in the `COPYING` files of the corresponding subfolders.
 
 ----------------------------------------------------------------------
 
@@ -851,3 +849,23 @@
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
 ----------------------------------------------------------------------
+
+                             MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

libde265-1.0.3.tar.gz/INSTALL -> libde265-1.0.5.tar.gz/INSTALL Changed

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@
 Basic Installation
 ==================
 
-   Briefly, the shell command `./configure && make && make install'
+   Briefly, the shell command './configure && make && make install'
 should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
+more-detailed instructions are generic; see the 'README' file for
 instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
 below.  The lack of an optional feature in a given package is not
 necessarily a bug.  More recommendations for GNU packages can be found
 in *note Makefile Conventions: (standards)Makefile Conventions.
 
-   The `configure' shell script attempts to guess correct values for
+   The 'configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
 you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
 
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+   It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring.  Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
 
    If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+   The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
 
    The simplest way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+  1. 'cd' to the directory containing the package's source code and type
+     './configure' to configure the package for your system.
 
-     Running `configure' might take a while.  While running, it prints
+     Running 'configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
+  2. Type 'make' to compile the package.
 
-  3. Optionally, type `make check' to run any self-tests that come with
+  3. Optionally, type 'make check' to run any self-tests that come with
      the package, generally using the just-built uninstalled binaries.
 
-  4. Type `make install' to install the programs and any data files and
+  4. Type 'make install' to install the programs and any data files and
      documentation.  When installing into a prefix owned by root, it is
      recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
+     user, and only the 'make install' phase executed with root
      privileges.
 
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
      this time using the binaries in their final installed location.
      This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
+     regular user, particularly if the prior 'make install' required
      root privileges, verifies that the installation completed
      correctly.
 
   6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  7. Often, you can also type `make uninstall' to remove the installed
+  7. Often, you can also type 'make uninstall' to remove the installed
      files again.  In practice, not all packages have tested that
      uninstallation works correctly, even though it is required by the
      GNU Coding Standards.
 
-  8. Some packages, particularly those that use Automake, provide `make
+  8. Some packages, particularly those that use Automake, provide 'make
      distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
+     targets like 'make install' and 'make uninstall' work correctly.
      This target is generally not run by end users.
 
 Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
+the 'configure' script does not know about.  Run './configure --help'
 for details on some of the pertinent environment variables.
 
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
+   You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here is
+an example:
 
      ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
@@ -113,21 +112,21 @@
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
 directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
+the 'configure' script.  'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'.  This is known
+as a "VPATH" build.
 
-   With a non-GNU `make', it is safer to compile the package for one
+   With a non-GNU 'make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
 reconfiguring for another architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor.  Like
 this:
 
      ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@
 
    This is not guaranteed to produce working output in all cases, you
 may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+   By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc.  You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
 absolute file name.
 
    You can specify separate installation prefixes for

libde265-1.0.3.tar.gz/Makefile.am -> libde265-1.0.5.tar.gz/Makefile.am Changed

libde265-1.0.3.tar.gz/Makefile.in -> libde265-1.0.5.tar.gz/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -90,7 +90,8 @@
 host_triplet = @host@
 target_triplet = @target@
 @ENABLE_DEC265_TRUE@am__append_1 = dec265
-@ENABLE_SHERLOCK265_TRUE@am__append_2 = sherlock265
+@ENABLE_ENCODER_TRUE@am__append_2 = enc265
+@ENABLE_SHERLOCK265_TRUE@am__append_3 = sherlock265
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
@@ -390,8 +391,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = libde265 $(am__append_1) enc265 tools acceleration-speed \
-	$(am__append_2)
+SUBDIRS = libde265 $(am__append_1) $(am__append_2) tools \
+	acceleration-speed $(am__append_3)
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = .travis.yml \
   autogen.sh \
@@ -661,7 +662,7 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -687,7 +688,7 @@
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -705,7 +706,7 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -715,7 +716,7 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac

libde265-1.0.3.tar.gz/README.md -> libde265-1.0.5.tar.gz/README.md Changed

libde265-1.0.3.tar.gz/acceleration-speed/Makefile.am -> libde265-1.0.5.tar.gz/acceleration-speed/Makefile.am Changed

libde265-1.0.3.tar.gz/acceleration-speed/Makefile.in -> libde265-1.0.5.tar.gz/acceleration-speed/Makefile.in Changed

libde265-1.0.3.tar.gz/aclocal.m4 -> libde265-1.0.5.tar.gz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -296,7 +296,7 @@
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -311,7 +311,7 @@
 [am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -327,14 +327,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # Figure out how to run the assembler.                      -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -354,7 +354,7 @@
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -406,7 +406,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -437,7 +437,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -628,7 +628,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -704,7 +704,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -901,7 +901,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -922,7 +922,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -943,7 +943,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -993,7 +993,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1032,7 +1032,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1061,7 +1061,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1108,7 +1108,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1127,7 +1127,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1208,7 +1208,7 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1268,7 +1268,7 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1296,7 +1296,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1315,7 +1315,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

libde265-1.0.3.tar.gz/config.guess -> libde265-1.0.5.tar.gz/config.guess Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2018-02-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -39,7 +39,7 @@
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -107,9 +107,9 @@
 dummy=$tmp/dummy ;
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
+ ,,)    echo "int x;" > "$dummy.c" ;
 	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
@@ -132,14 +132,14 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
 Linux|GNU|GNU/*)
 	# If the system lacks a compiler, then just pick glibc.
 	# We could probably try harder.
 	LIBC=gnu
 
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
+	eval "$set_cc_for_build"
+	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
@@ -149,13 +149,20 @@
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+	# If ldd exists, use it to detect musl libc.
+	if command -v ldd >/dev/null && \
+		ldd --version 2>&1 | grep -q ^musl
+	then
+	    LIBC=musl
+	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,27 +176,30 @@
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
 	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || \
+	    "/sbin/$sysctl" 2>/dev/null || \
+	    "/usr/sbin/$sysctl" 2>/dev/null || \
 	    echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
+	case "$UNAME_MACHINE_ARCH" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
 	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e$armv[0-9]$.*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*$eb$$,\1,p'`
-		machine=${arch}${endian}-unknown
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv[0-9]$.*$,\1,'`
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'`
+		machine="${arch}${endian}"-unknown
 		;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
+	# to ELF recently (or will in the future) and ABI.
+	case "$UNAME_MACHINE_ARCH" in
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval "$set_cc_for_build"
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -205,10 +215,10 @@
 		;;
 	esac
 	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
+	case "$UNAME_MACHINE_ARCH" in
 	    earm*)
 		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
 		;;
 	esac
 	# The OS release
@@ -216,42 +226,55 @@
 	# thus, need a distinct triplet. However, they do not need
 	# kernel version information, so it can be replaced with a
 	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
+	case "$UNAME_VERSION" in
 	    Debian*)
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
+	echo "$machine-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
 	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+	exit ;;
+    *:MidnightBSD:*:*)
+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
 	exit ;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
 	exit ;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
 	exit ;;

libde265-1.0.3.tar.gz/config.sub -> libde265-1.0.5.tar.gz/config.sub Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2018-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,12 +53,11 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -68,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -95,7 +94,7 @@
 
     *local*)
        # First pass through any local machine types.
-       echo $1
+       echo "$1"
        exit ;;
 
     * )
@@ -113,24 +112,24 @@
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
+maybe_os=`echo "$1" | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
+    basic_machine=`echo "$1" | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
     ;;
   android-linux)
     os=-linux-android
-    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown
+    basic_machine=`echo "$1" | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown
     ;;
   *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+    if [ "$basic_machine" != "$1" ]
+    then os=`echo "$1" | sed 's/.*-/-/'`
     else os=; fi
     ;;
 esac
@@ -179,44 +178,44 @@
 		;;
 	-sco6)
 		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5)
 		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
@@ -228,10 +227,7 @@
 		os=-lynxos
 		;;
 	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
 		;;
 	-psos*)
 		os=-psos
@@ -264,7 +260,7 @@
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
@@ -300,8 +296,9 @@
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
+	| pdp10 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
@@ -315,7 +312,7 @@
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
-	| we32k \
+	| wasm32 \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
@@ -336,7 +333,7 @@
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
 	ms1)
 		basic_machine=mt-unknown
@@ -365,7 +362,7 @@

libde265-1.0.3.tar.gz/configure -> libde265-1.0.5.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libde265 1.0.3.
+# Generated by GNU Autoconf 2.69 for libde265 1.0.5.
 #
 # Report bugs to <farin@struktur.de>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='libde265'
 PACKAGE_TARNAME='libde265'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='libde265 1.0.3'
+PACKAGE_VERSION='1.0.5'
+PACKAGE_STRING='libde265 1.0.5'
 PACKAGE_BUGREPORT='farin@struktur.de'
 PACKAGE_URL=''
 
@@ -668,6 +668,8 @@
 ENABLE_ARM_OPT_TRUE
 ENABLE_SSE_OPT_FALSE
 ENABLE_SSE_OPT_TRUE
+ENABLE_ENCODER_FALSE
+ENABLE_ENCODER_TRUE
 MINGW_FALSE
 MINGW_TRUE
 LIBOBJS
@@ -822,6 +824,7 @@
 enable_libtool_lock
 enable_dependency_tracking
 enable_silent_rules
+enable_encoder
 enable_sse
 enable_arm
 enable_thumb
@@ -1409,7 +1412,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libde265 1.0.3 to adapt to many kinds of systems.
+\`configure' configures libde265 1.0.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1481,7 +1484,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libde265 1.0.3:";;
+     short | recursive ) echo "Configuration of libde265 1.0.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1500,6 +1503,7 @@
                           speeds up one-time build
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --disable-encoder       Do not build encoder.
   --disable-sse           disable SSE optimizations (default=no)
   --disable-arm           disable ARM optimizations (default=no)
   --enable-thumb          disable ARM THUMB instructions (default=no)
@@ -1622,7 +1626,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libde265 configure 1.0.3
+libde265 configure 1.0.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2387,7 +2391,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libde265 $as_me 1.0.3, which was
+It was created by libde265 $as_me 1.0.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2742,11 +2746,17 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
-NUMERIC_VERSION=0x01000300 # Numeric representation of the version (A.B.C[.D] = 0xAABBCCDD)
+NUMERIC_VERSION=0x01000500 # Numeric representation of the version (A.B.C[.D] = 0xAABBCCDD)
 
 
+# From https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html:
+# If the library source code has changed at all since the last update, then increment revision (‘c:r:a’ becomes ‘c:r+1:a’).
+# If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
+# If any interfaces have been added since the last public release, then increment age.
+# If any interfaces have been removed or changed since the last public release, then set age to 0.
+
 LIBDE265_CURRENT=0
-LIBDE265_REVISION=10
+LIBDE265_REVISION=12
 LIBDE265_AGE=0
 
 # ---------------------------------------------------------------------------
@@ -16704,7 +16714,7 @@
 
 # Define the identity of the package.
  PACKAGE='libde265'
- VERSION='1.0.3'
+ VERSION='1.0.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18434,7 +18444,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-# Check if "std::move" is available
+# Check if "std::move" is available (assume always available with clang)
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::move" >&5
 $as_echo_n "checking for std::move... " >&6; }
 ac_ext=cpp
@@ -18452,9 +18462,11 @@
 main ()
 {
 
+#if !defined(__clang__)
 class A {};
 A* a = new A();
 A* b = std::move(a);
+#endif
 
   ;
   return 0;
@@ -18524,6 +18536,25 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_nullptr" >&5
 $as_echo "$has_nullptr" >&6; }
 
+
+
+# Check whether --enable-encoder was given.
+if test "${enable_encoder+set}" = set; then :
+  enableval=$enable_encoder;
+fi
+
+if eval "test x$enable_encoder = x"      ; then enable_encoder=yes ; fi
+
+ if test x"$enable_encoder" = x"yes"; then
+  ENABLE_ENCODER_TRUE=
+  ENABLE_ENCODER_FALSE='#'
+else
+  ENABLE_ENCODER_TRUE='#'
+  ENABLE_ENCODER_FALSE=
+fi
+
+
+
 # --- machine dependent optimizations ---
 
 #AX_EXT
@@ -19492,6 +19523,8 @@
 $as_echo "$as_me: Building dec265 example: $enable_dec265" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: Building sherlock265 example: $enable_sherlock265" >&5
 $as_echo "$as_me: Building sherlock265 example: $enable_sherlock265" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Building encoder: $enable_encoder" >&5
+$as_echo "$as_me: Building encoder: $enable_encoder" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: ---------------------------------------" >&5
 $as_echo "$as_me: ---------------------------------------" >&6;}
 
@@ -19670,6 +19703,10 @@
   as_fn_error $? "conditional \"MINGW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_ENCODER_TRUE}" && test -z "${ENABLE_ENCODER_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_ENCODER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_SSE_OPT_TRUE}" && test -z "${ENABLE_SSE_OPT_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_SSE_OPT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20103,7 +20140,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libde265 $as_me 1.0.3, which was
+This file was extended by libde265 $as_me 1.0.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20169,7 +20206,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libde265 config.status 1.0.3
+libde265 config.status 1.0.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -21305,7 +21342,6 @@
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

libde265-1.0.3.tar.gz/configure.ac -> libde265-1.0.5.tar.gz/configure.ac Changed

@@ -2,15 +2,21 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([libde265], [1.0.3], [farin@struktur.de])
+AC_INIT([libde265], [1.0.5], [farin@struktur.de])
 AC_CONFIG_SRCDIR([libde265/de265.cc])
 AC_CONFIG_HEADERS([config.h])
 
-NUMERIC_VERSION=0x01000300 # Numeric representation of the version (A.B.C[.D] = 0xAABBCCDD)
+NUMERIC_VERSION=0x01000500 # Numeric representation of the version (A.B.C[.D] = 0xAABBCCDD)
 AC_SUBST(NUMERIC_VERSION)
 
+# From https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html:
+# If the library source code has changed at all since the last update, then increment revision (‘c:r:a’ becomes ‘c:r+1:a’).
+# If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
+# If any interfaces have been added since the last public release, then increment age.
+# If any interfaces have been removed or changed since the last public release, then set age to 0.
+
 LIBDE265_CURRENT=0
-LIBDE265_REVISION=10
+LIBDE265_REVISION=12
 LIBDE265_AGE=0
 
 # ---------------------------------------------------------------------------
@@ -138,15 +144,17 @@
 fi
 AC_LANG_POP(C++)
 
-# Check if "std::move" is available
+# Check if "std::move" is available (assume always available with clang)
 AC_MSG_CHECKING([for std::move])
 AC_LANG_PUSH(C++)
 AC_TRY_COMPILE([
 #include <utility>
 ],[
+#if !defined(__clang__)
 class A {};
 A* a = new A();
 A* b = std::move(a);
+#endif
 ],[has_std_move=yes],[has_std_move=no]);
 AC_LANG_POP(C++)
 if eval "test x$has_std_move = xno"; then
@@ -168,6 +176,14 @@
 fi
 AC_MSG_RESULT([$has_nullptr])
 
+
+
+AC_ARG_ENABLE([encoder], AS_HELP_STRING([--disable-encoder], [Do not build encoder.]))
+if eval "test x$enable_encoder = x"      ; then enable_encoder=yes ; fi
+
+AM_CONDITIONAL([ENABLE_ENCODER], [test x"$enable_encoder" = x"yes"])
+
+
 # --- machine dependent optimizations ---
 
 #AX_EXT
@@ -355,6 +371,7 @@
 AC_MSG_NOTICE([---------------------------------------])
 AC_MSG_NOTICE([Building dec265 example: $enable_dec265])
 AC_MSG_NOTICE([Building sherlock265 example: $enable_sherlock265])
+AC_MSG_NOTICE([Building encoder: $enable_encoder])
 AC_MSG_NOTICE([---------------------------------------])
 
 AC_CONFIG_FILES([Makefile])

libde265-1.0.3.tar.gz/dec265/CMakeLists.txt -> libde265-1.0.5.tar.gz/dec265/CMakeLists.txt Changed

@@ -1,41 +1,24 @@
-set (dec265_sources
-  dec265.cc
-)
+add_executable (dec265 dec265.cc)
 
-set (hdrcopy_sources
-  hdrcopy.cc
-)
+target_link_libraries (dec265 PRIVATE ${PROJECT_NAME})
+
+if(SDL_FOUND)
+  target_sources(dec265 PRIVATE sdl.cc)
+  target_compile_definitions(dec265 PRIVATE HAVE_SDL)
+  target_include_directories (dec265 PRIVATE "${SDL_INCLUDE_DIR}")
+  target_link_libraries (dec265 PRIVATE ${SDL_LIBRARY})
+endif()
 
 if(MSVC)
-  set (dec265_sources
-    ${dec265_sources}
-    ../extra/getopt.c
-    ../extra/getopt_long.c
-  )
-  set (hdrcopy_sources
-    ${hdrcopy_sources}
+  target_sources(dec265 PRIVATE 
     ../extra/getopt.c
     ../extra/getopt_long.c
   )
 endif()
 
-if(SDL_FOUND)
-  add_definitions(-DHAVE_SDL)
-  include_directories ("${SDL_INCLUDE_DIR}")
-  set (dec265_sources
-    ${dec265_sources}
-    sdl.cc
-  )
-endif()
-
-add_executable (dec265 ${dec265_sources})
-
-target_link_libraries (dec265 ${LIBDE265_LIBRARY_NAME} ${SDL_LIBRARY})
-
-
 if(NOT MSVC)
   # hdrcopy uses internal APIs that are not available when compiled for Windows
-  add_executable (hdrcopy ${hdrcopy_sources})
+  add_executable (hdrcopy hdrcopy.cc)
 
-  target_link_libraries (hdrcopy ${LIBDE265_LIBRARY_NAME})
+  target_link_libraries (hdrcopy PRIVATE ${PROJECT_NAME})
 endif()

libde265-1.0.3.tar.gz/dec265/COPYING -> libde265-1.0.5.tar.gz/dec265/COPYING Changed

@@ -1,674 +1,20 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;

libde265-1.0.3.tar.gz/dec265/Makefile.am -> libde265-1.0.5.tar.gz/dec265/Makefile.am Changed

libde265-1.0.3.tar.gz/dec265/Makefile.in -> libde265-1.0.5.tar.gz/dec265/Makefile.in Changed

libde265-1.0.3.tar.gz/dec265/dec265.cc -> libde265-1.0.5.tar.gz/dec265/dec265.cc Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "dec265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of dec265, an example application using libde265.
- *
- * dec265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * dec265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with dec265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "dec265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #define DO_MEMORY_LOGGING 0
 
@@ -106,9 +112,13 @@
 static void write_picture(const de265_image* img)
 {
   static FILE* fh = NULL;
-  if (fh==NULL) { fh = fopen(output_filename, "wb"); }
-
-
+  if (fh==NULL) {
+    if (strcmp(output_filename, "-") == 0) {
+      fh = stdout;
+    } else {
+      fh = fopen(output_filename, "wb");
+    }
+  }
 
   for (int c=0;c<3;c++) {
     int stride;
@@ -659,9 +669,16 @@
   }
 
 
-  FILE* fh = fopen(argv[optind], "rb");
+  FILE* fh;
+  if (strcmp(argv[optind],"-")==0) {
+    fh = stdin;
+  }
+  else {
+    fh = fopen(argv[optind], "rb");
+  }
+
   if (fh==NULL) {
-    fprintf(stderr,"cannot open file %s!\n", argv[1]);
+    fprintf(stderr,"cannot open file %s!\n", argv[optind]);
     exit(10);
   }

libde265-1.0.3.tar.gz/dec265/hdrcopy.cc -> libde265-1.0.5.tar.gz/dec265/hdrcopy.cc Changed

@@ -1,22 +1,28 @@
 /*
- * H.265 video codec.
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of libde265.
- *
- * libde265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * libde265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application.
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 
 #include "libde265/nal-parser.h"

libde265-1.0.3.tar.gz/dec265/sdl.cc -> libde265-1.0.5.tar.gz/dec265/sdl.cc Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "dec265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of dec265, an example application using libde265.
- *
- * dec265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * dec265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with dec265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  This file is part of dec265, an example application using libde265.
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #include "sdl.hh"
 #include <assert.h>

libde265-1.0.3.tar.gz/dec265/sdl.hh -> libde265-1.0.5.tar.gz/dec265/sdl.hh Changed

@@ -1,21 +1,27 @@
 /*
- * libde265 example application "dec265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of dec265, an example application using libde265.
- *
- * dec265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * dec265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with dec265.  If not, see <http://www.gnu.org/licenses/>.
+  This file is part of dec265, an example application using libde265.
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
  */
 
 #include <SDL.h>

libde265-1.0.3.tar.gz/depcomp -> libde265-1.0.5.tar.gz/depcomp Changed

libde265-1.0.3.tar.gz/enc265/CMakeLists.txt -> libde265-1.0.5.tar.gz/enc265/CMakeLists.txt Changed

libde265-1.0.5.tar.gz/enc265/COPYING Added

@@ -0,0 +1,20 @@
+
+                           MIT License
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.

libde265-1.0.3.tar.gz/enc265/Makefile.am -> libde265-1.0.5.tar.gz/enc265/Makefile.am Changed

libde265-1.0.3.tar.gz/enc265/Makefile.in -> libde265-1.0.5.tar.gz/enc265/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -198,7 +198,7 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp COPYING
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -347,7 +347,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I../libde265
+AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
 enc265_DEPENDENCIES = ../libde265/libde265.la
 enc265_CXXFLAGS = $(am__append_1)
 enc265_LDFLAGS = $(am__append_2)

libde265-1.0.3.tar.gz/enc265/enc265.cc -> libde265-1.0.5.tar.gz/enc265/enc265.cc Changed

@@ -1,22 +1,28 @@
 /*
- * H.265 video codec.
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of libde265.
- *
- * libde265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * libde265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "enc265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #include "libde265/en265.h"
 #ifdef HAVE_CONFIG_H

libde265-1.0.3.tar.gz/enc265/image-io-png.cc -> libde265-1.0.5.tar.gz/enc265/image-io-png.cc Changed

@@ -1,24 +1,28 @@
 /*
- * H.265 video codec.
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * Authors: struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of libde265.
- *
- * libde265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * libde265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "enc265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #include "image-io-png.h"
 #include <assert.h>
@@ -75,7 +79,7 @@
 
   de265_image* img = new de265_image;
   img->alloc_image(mWidth,mHeight,de265_chroma_444, NULL, false,
-                   NULL, NULL, 0, NULL, false);
+                   NULL, /*NULL,*/ 0, NULL, false);
   assert(img); // TODO: error handling

libde265-1.0.3.tar.gz/enc265/image-io-png.h -> libde265-1.0.5.tar.gz/enc265/image-io-png.h Changed

@@ -1,23 +1,27 @@
 /*
- * H.265 video codec.
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * Authors: struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of libde265.
- *
- * libde265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * libde265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
+  libde265 example application "enc265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
  */
 
 #ifndef IMAGE_IO_PNG_H

libde265-1.0.3.tar.gz/libde265/CMakeLists.txt -> libde265-1.0.5.tar.gz/libde265/CMakeLists.txt Changed

@@ -1,58 +1,76 @@
+include(CMakePackageConfigHelpers)
+
 set (libde265_sources 
+  alloc_pool.cc
   bitstream.cc
   cabac.cc
+  configparam.cc
+  contextmodel.cc
   de265.cc
   deblock.cc
   decctx.cc
-  nal-parser.cc
-  nal-parser.h
   dpb.cc
-  dpb.h
+  en265.cc
+  fallback-dct.cc
+  fallback-motion.cc 
+  fallback.cc
+  image-io.cc
   image.cc
   intrapred.cc
   md5.cc
+  motion.cc
+  nal-parser.cc
   nal.cc
   pps.cc
-  transform.cc
+  quality.cc
   refpic.cc
   sao.cc
   scan.cc
   sei.cc
   slice.cc
   sps.cc
+  threads.cc
+  transform.cc
   util.cc
+  visualize.cc
   vps.cc
+  vui.cc
+)
+
+set (libde265_headers
+  acceleration.h
+  alloc_pool.h
   bitstream.h
   cabac.h
+  configparam.h
   deblock.h
   decctx.h
+  dpb.h
+  en265.h
+  fallback-dct.h
+  fallback-motion.h
+  fallback.h
+  image-io.h
   image.h
   intrapred.h
   md5.h
+  motion.h
+  nal-parser.h
   nal.h
   pps.h
-  transform.h
+  quality.h
   refpic.h
   sao.h
   scan.h
   sei.h
   slice.h
   sps.h
+  threads.h
+  transform.h
   util.h
+  visualize.h
   vps.h
-  vui.h vui.cc
-  motion.cc motion.h
-  threads.cc threads.h
-  visualize.cc visualize.h
-  acceleration.h
-  fallback.cc fallback.h fallback-motion.cc fallback-motion.h
-  fallback-dct.h fallback-dct.cc
-  quality.cc quality.h
-  configparam.cc configparam.h
-  image-io.h image-io.cc
-  alloc_pool.h alloc_pool.cc
-  en265.h en265.cc
-  contextmodel.cc
+  vui.h
 )
 
 if(MSVC)
@@ -72,9 +90,20 @@
   add_subdirectory (x86)
 endif()
 
-add_library(${LIBDE265_LIBRARY_NAME} SHARED ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS})
-target_link_libraries(${LIBDE265_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT})
+add_library(${PROJECT_NAME} SHARED ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS})
+target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads)
+
+write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake COMPATIBILITY ExactVersion)
+
+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+install(FILES ${libde265_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+
+install(EXPORT ${PROJECT_NAME}Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  SET_TARGET_PROPERTIES(${LIBDE265_LIBRARY_NAME} PROPERTIES COMPILE_FLAGS "-fPIC")
-endif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake DESTINATION
+    "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")

libde265-1.0.3.tar.gz/libde265/Makefile.am -> libde265-1.0.5.tar.gz/libde265/Makefile.am Changed

libde265-1.0.3.tar.gz/libde265/Makefile.in -> libde265-1.0.5.tar.gz/libde265/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -92,12 +92,15 @@
 target_triplet = @target@
 @HAVE_VISIBILITY_TRUE@am__append_1 = -DHAVE_VISIBILITY
 @HAVE_VISIBILITY_TRUE@am__append_2 = -DHAVE_VISIBILITY
-@ENABLE_SSE_OPT_TRUE@am__append_3 = x86
-@ENABLE_SSE_OPT_TRUE@am__append_4 = x86/libde265_x86.la
-@ENABLE_ARM_OPT_TRUE@am__append_5 = arm
-@ENABLE_ARM_OPT_TRUE@am__append_6 = arm/libde265_arm.la
-@MINGW_TRUE@am__append_7 = ../extra/win32cond.c ../extra/win32cond.h
-@MINGW_TRUE@am__append_8 = -no-undefined -static-libgcc -static-libstdc++
+@ENABLE_ENCODER_TRUE@am__append_3 = en265.h en265.cc
+@ENABLE_ENCODER_TRUE@am__append_4 = encoder
+@ENABLE_ENCODER_TRUE@am__append_5 = encoder/libde265_encoder.la
+@ENABLE_SSE_OPT_TRUE@am__append_6 = x86
+@ENABLE_SSE_OPT_TRUE@am__append_7 = x86/libde265_x86.la
+@ENABLE_ARM_OPT_TRUE@am__append_8 = arm
+@ENABLE_ARM_OPT_TRUE@am__append_9 = arm/libde265_arm.la
+@MINGW_TRUE@am__append_10 = ../extra/win32cond.c ../extra/win32cond.h
+@MINGW_TRUE@am__append_11 = -no-undefined -static-libgcc -static-libstdc++
 subdir = libde265
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
@@ -144,40 +147,40 @@
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libde265_ladir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libde265_la_DEPENDENCIES = encoder/libde265_encoder.la $(am__append_4) \
-	$(am__append_6)
+libde265_la_DEPENDENCIES = $(am__append_5) $(am__append_7) \
+	$(am__append_9)
 am__libde265_la_SOURCES_DIST = acceleration.h alloc_pool.h \
 	alloc_pool.cc bitstream.cc bitstream.h cabac.cc cabac.h \
 	configparam.cc configparam.h contextmodel.cc contextmodel.h \
-	de265.cc deblock.cc deblock.h decctx.cc decctx.h en265.h \
-	en265.cc fallback.cc fallback.h fallback-dct.h fallback-dct.cc \
-	fallback-motion.cc fallback-motion.h dpb.cc dpb.h image.cc \
-	image.h image-io.h image-io.cc intrapred.cc intrapred.h md5.cc \
-	md5.h motion.cc motion.h nal.cc nal.h nal-parser.cc \
-	nal-parser.h pps.cc pps.h quality.cc quality.h refpic.cc \
-	refpic.h sao.cc sao.h scan.cc scan.h sei.cc sei.h slice.cc \
-	slice.h sps.cc sps.h threads.cc threads.h transform.cc \
-	transform.h util.cc util.h visualize.cc visualize.h vps.cc \
-	vps.h vui.cc vui.h ../extra/win32cond.c ../extra/win32cond.h
+	de265.cc deblock.cc deblock.h decctx.cc decctx.h fallback.cc \
+	fallback.h fallback-dct.h fallback-dct.cc fallback-motion.cc \
+	fallback-motion.h dpb.cc dpb.h image.cc image.h image-io.h \
+	image-io.cc intrapred.cc intrapred.h md5.cc md5.h motion.cc \
+	motion.h nal.cc nal.h nal-parser.cc nal-parser.h pps.cc pps.h \
+	quality.cc quality.h refpic.cc refpic.h sao.cc sao.h scan.cc \
+	scan.h sei.cc sei.h slice.cc slice.h sps.cc sps.h threads.cc \
+	threads.h transform.cc transform.h util.cc util.h visualize.cc \
+	visualize.h vps.cc vps.h vui.cc vui.h en265.h en265.cc \
+	../extra/win32cond.c ../extra/win32cond.h
+@ENABLE_ENCODER_TRUE@am__objects_1 = libde265_la-en265.lo
 am__dirstamp = $(am__leading_dot)dirstamp
-@MINGW_TRUE@am__objects_1 = ../extra/libde265_la-win32cond.lo
+@MINGW_TRUE@am__objects_2 = ../extra/libde265_la-win32cond.lo
 am_libde265_la_OBJECTS = libde265_la-alloc_pool.lo \
 	libde265_la-bitstream.lo libde265_la-cabac.lo \
 	libde265_la-configparam.lo libde265_la-contextmodel.lo \
 	libde265_la-de265.lo libde265_la-deblock.lo \
-	libde265_la-decctx.lo libde265_la-en265.lo \
-	libde265_la-fallback.lo libde265_la-fallback-dct.lo \
-	libde265_la-fallback-motion.lo libde265_la-dpb.lo \
-	libde265_la-image.lo libde265_la-image-io.lo \
-	libde265_la-intrapred.lo libde265_la-md5.lo \
-	libde265_la-motion.lo libde265_la-nal.lo \
+	libde265_la-decctx.lo libde265_la-fallback.lo \
+	libde265_la-fallback-dct.lo libde265_la-fallback-motion.lo \
+	libde265_la-dpb.lo libde265_la-image.lo \
+	libde265_la-image-io.lo libde265_la-intrapred.lo \
+	libde265_la-md5.lo libde265_la-motion.lo libde265_la-nal.lo \
 	libde265_la-nal-parser.lo libde265_la-pps.lo \
 	libde265_la-quality.lo libde265_la-refpic.lo \
 	libde265_la-sao.lo libde265_la-scan.lo libde265_la-sei.lo \
 	libde265_la-slice.lo libde265_la-sps.lo libde265_la-threads.lo \
 	libde265_la-transform.lo libde265_la-util.lo \
 	libde265_la-visualize.lo libde265_la-vps.lo libde265_la-vui.lo \
-	$(am__objects_1)
+	$(am__objects_1) $(am__objects_2)
 libde265_la_OBJECTS = $(am_libde265_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -466,26 +469,25 @@
 libde265_la_CFLAGS = $(CFLAG_VISIBILITY) -DLIBDE265_EXPORTS \
 	$(am__append_1)
 libde265_la_CXXFLAGS = $(CFLAG_VISIBILITY) -DLIBDE265_EXPORTS \
-	$(am__append_2)
+	-I$(top_srcdir) $(am__append_2)
 libde265_la_LDFLAGS = -version-info \
 	$(LIBDE265_CURRENT):$(LIBDE265_REVISION):$(LIBDE265_AGE) \
-	$(am__append_8)
+	$(am__append_11)
 libde265_la_SOURCES = acceleration.h alloc_pool.h alloc_pool.cc \
 	bitstream.cc bitstream.h cabac.cc cabac.h configparam.cc \
 	configparam.h contextmodel.cc contextmodel.h de265.cc \
-	deblock.cc deblock.h decctx.cc decctx.h en265.h en265.cc \
-	fallback.cc fallback.h fallback-dct.h fallback-dct.cc \
-	fallback-motion.cc fallback-motion.h dpb.cc dpb.h image.cc \
-	image.h image-io.h image-io.cc intrapred.cc intrapred.h md5.cc \
-	md5.h motion.cc motion.h nal.cc nal.h nal-parser.cc \
-	nal-parser.h pps.cc pps.h quality.cc quality.h refpic.cc \
-	refpic.h sao.cc sao.h scan.cc scan.h sei.cc sei.h slice.cc \
-	slice.h sps.cc sps.h threads.cc threads.h transform.cc \
-	transform.h util.cc util.h visualize.cc visualize.h vps.cc \
-	vps.h vui.cc vui.h $(am__append_7)
-SUBDIRS = encoder $(am__append_3) $(am__append_5)
-libde265_la_LIBADD = encoder/libde265_encoder.la $(am__append_4) \
-	$(am__append_6)
+	deblock.cc deblock.h decctx.cc decctx.h fallback.cc fallback.h \
+	fallback-dct.h fallback-dct.cc fallback-motion.cc \
+	fallback-motion.h dpb.cc dpb.h image.cc image.h image-io.h \
+	image-io.cc intrapred.cc intrapred.h md5.cc md5.h motion.cc \
+	motion.h nal.cc nal.h nal-parser.cc nal-parser.h pps.cc pps.h \
+	quality.cc quality.h refpic.cc refpic.h sao.cc sao.h scan.cc \
+	scan.h sei.cc sei.h slice.cc slice.h sps.cc sps.h threads.cc \
+	threads.h transform.cc transform.h util.cc util.h visualize.cc \
+	visualize.h vps.cc vps.h vui.cc vui.h $(am__append_3) \
+	$(am__append_10)
+SUBDIRS = $(am__append_4) $(am__append_6) $(am__append_8)
+libde265_la_LIBADD = $(am__append_5) $(am__append_7) $(am__append_9)
 EXTRA_DIST = Makefile.vc7 \
   CMakeLists.txt \
   ../extra/stdbool.h \
@@ -732,13 +734,6 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libde265_la_CPPFLAGS) $(CPPFLAGS) $(libde265_la_CXXFLAGS) $(CXXFLAGS) -c -o libde265_la-decctx.lo `test -f 'decctx.cc' || echo '$(srcdir)/'`decctx.cc
 
-libde265_la-en265.lo: en265.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libde265_la_CPPFLAGS) $(CPPFLAGS) $(libde265_la_CXXFLAGS) $(CXXFLAGS) -MT libde265_la-en265.lo -MD -MP -MF $(DEPDIR)/libde265_la-en265.Tpo -c -o libde265_la-en265.lo `test -f 'en265.cc' || echo '$(srcdir)/'`en265.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libde265_la-en265.Tpo $(DEPDIR)/libde265_la-en265.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='en265.cc' object='libde265_la-en265.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libde265_la_CPPFLAGS) $(CPPFLAGS) $(libde265_la_CXXFLAGS) $(CXXFLAGS) -c -o libde265_la-en265.lo `test -f 'en265.cc' || echo '$(srcdir)/'`en265.cc
-
 libde265_la-fallback.lo: fallback.cc
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libde265_la_CPPFLAGS) $(CPPFLAGS) $(libde265_la_CXXFLAGS) $(CXXFLAGS) -MT libde265_la-fallback.lo -MD -MP -MF $(DEPDIR)/libde265_la-fallback.Tpo -c -o libde265_la-fallback.lo `test -f 'fallback.cc' || echo '$(srcdir)/'`fallback.cc
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libde265_la-fallback.Tpo $(DEPDIR)/libde265_la-fallback.Plo
@@ -914,6 +909,13 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libde265_la_CPPFLAGS) $(CPPFLAGS) $(libde265_la_CXXFLAGS) $(CXXFLAGS) -c -o libde265_la-vui.lo `test -f 'vui.cc' || echo '$(srcdir)/'`vui.cc
 
+libde265_la-en265.lo: en265.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libde265_la_CPPFLAGS) $(CPPFLAGS) $(libde265_la_CXXFLAGS) $(CXXFLAGS) -MT libde265_la-en265.lo -MD -MP -MF $(DEPDIR)/libde265_la-en265.Tpo -c -o libde265_la-en265.lo `test -f 'en265.cc' || echo '$(srcdir)/'`en265.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libde265_la-en265.Tpo $(DEPDIR)/libde265_la-en265.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='en265.cc' object='libde265_la-en265.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libde265_la_CPPFLAGS) $(CPPFLAGS) $(libde265_la_CXXFLAGS) $(CXXFLAGS) -c -o libde265_la-en265.lo `test -f 'en265.cc' || echo '$(srcdir)/'`en265.cc
+
 mostlyclean-libtool:
 	-rm -f *.lo

libde265-1.0.3.tar.gz/libde265/Makefile.vc7 -> libde265-1.0.5.tar.gz/libde265/Makefile.vc7 Changed

libde265-1.0.3.tar.gz/libde265/arm/Makefile.in -> libde265-1.0.5.tar.gz/libde265/arm/Makefile.in Changed

libde265-1.0.3.tar.gz/libde265/de265-version.h -> libde265-1.0.5.tar.gz/libde265/de265-version.h Changed

libde265-1.0.3.tar.gz/libde265/de265.cc -> libde265-1.0.5.tar.gz/libde265/de265.cc Changed

@@ -31,6 +31,7 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
+#include <mutex>
 
 
 // TODO: should be in some vps.c related header
@@ -168,12 +169,18 @@
 
 
 
-static std::atomic<int> de265_init_count;
+static int de265_init_count;
+
+static std::mutex de265_init_mutex;
+
 
 LIBDE265_API de265_error de265_init()
 {
-  int cnt = std::atomic_fetch_add(&de265_init_count,1);
-  if (cnt>0) {
+  std::lock_guard<std::mutex> lock(de265_init_mutex);
+
+  de265_init_count++;
+
+  if (de265_init_count > 1) {
     // we are not the first -> already initialized
 
     return DE265_OK;
@@ -185,7 +192,7 @@
   init_scan_orders();
 
   if (!alloc_and_init_significant_coeff_ctxIdx_lookupTable()) {
-    std::atomic_fetch_sub(&de265_init_count,1);
+    de265_init_count--;
     return DE265_ERROR_LIBRARY_INITIALIZATION_FAILED;
   }
 
@@ -194,13 +201,15 @@
 
 LIBDE265_API de265_error de265_free()
 {
-  int cnt = std::atomic_fetch_sub(&de265_init_count,1);
-  if (cnt<=0) {
-    std::atomic_fetch_add(&de265_init_count,1);
+  std::lock_guard<std::mutex> lock(de265_init_mutex);
+
+  if (de265_init_count<=0) {
     return DE265_ERROR_LIBRARY_NOT_INITIALIZED;
   }
 
-  if (cnt==1) {
+  de265_init_count--;
+
+  if (de265_init_count==0) {
     free_significant_coeff_ctxIdx_lookupTable();
   }

libde265-1.0.3.tar.gz/libde265/decctx.cc -> libde265-1.0.5.tar.gz/libde265/decctx.cc Changed

libde265-1.0.3.tar.gz/libde265/decctx.h -> libde265-1.0.5.tar.gz/libde265/decctx.h Changed

libde265-1.0.3.tar.gz/libde265/dpb.cc -> libde265-1.0.5.tar.gz/libde265/dpb.cc Changed

libde265-1.0.3.tar.gz/libde265/en265.cc -> libde265-1.0.5.tar.gz/libde265/en265.cc Changed

libde265-1.0.3.tar.gz/libde265/en265.h -> libde265-1.0.5.tar.gz/libde265/en265.h Changed

libde265-1.0.3.tar.gz/libde265/encoder/CMakeLists.txt -> libde265-1.0.5.tar.gz/libde265/encoder/CMakeLists.txt Changed

libde265-1.0.3.tar.gz/libde265/encoder/Makefile.am -> libde265-1.0.5.tar.gz/libde265/encoder/Makefile.am Changed

libde265-1.0.3.tar.gz/libde265/encoder/Makefile.in -> libde265-1.0.5.tar.gz/libde265/encoder/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -112,6 +112,8 @@
 	libde265_encoder_la-encoder-params.lo \
 	libde265_encoder_la-encoder-context.lo \
 	libde265_encoder_la-encoder-syntax.lo \
+	libde265_encoder_la-encoder-intrapred.lo \
+	libde265_encoder_la-encoder-motion.lo \
 	libde265_encoder_la-encpicbuf.lo libde265_encoder_la-sop.lo
 libde265_encoder_la_OBJECTS = $(am_libde265_encoder_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -392,13 +394,15 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libde265_encoder.la
-libde265_encoder_la_CXXFLAGS = -I..
+libde265_encoder_la_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libde265
 libde265_encoder_la_SOURCES = \
   encoder-core.cc encoder-core.h \
   encoder-types.h encoder-types.cc \
   encoder-params.h encoder-params.cc \
   encoder-context.h encoder-context.cc \
   encoder-syntax.h encoder-syntax.cc \
+  encoder-intrapred.h encoder-intrapred.cc \
+  encoder-motion.h encoder-motion.cc \
   encpicbuf.h encpicbuf.cc \
   sop.h sop.cc
 
@@ -463,6 +467,8 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-context.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-intrapred.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-motion.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-params.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-syntax.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-types.Plo@am__quote@
@@ -525,6 +531,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_encoder_la_CXXFLAGS) $(CXXFLAGS) -c -o libde265_encoder_la-encoder-syntax.lo `test -f 'encoder-syntax.cc' || echo '$(srcdir)/'`encoder-syntax.cc
 
+libde265_encoder_la-encoder-intrapred.lo: encoder-intrapred.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_encoder_la_CXXFLAGS) $(CXXFLAGS) -MT libde265_encoder_la-encoder-intrapred.lo -MD -MP -MF $(DEPDIR)/libde265_encoder_la-encoder-intrapred.Tpo -c -o libde265_encoder_la-encoder-intrapred.lo `test -f 'encoder-intrapred.cc' || echo '$(srcdir)/'`encoder-intrapred.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libde265_encoder_la-encoder-intrapred.Tpo $(DEPDIR)/libde265_encoder_la-encoder-intrapred.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='encoder-intrapred.cc' object='libde265_encoder_la-encoder-intrapred.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_encoder_la_CXXFLAGS) $(CXXFLAGS) -c -o libde265_encoder_la-encoder-intrapred.lo `test -f 'encoder-intrapred.cc' || echo '$(srcdir)/'`encoder-intrapred.cc
+
+libde265_encoder_la-encoder-motion.lo: encoder-motion.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_encoder_la_CXXFLAGS) $(CXXFLAGS) -MT libde265_encoder_la-encoder-motion.lo -MD -MP -MF $(DEPDIR)/libde265_encoder_la-encoder-motion.Tpo -c -o libde265_encoder_la-encoder-motion.lo `test -f 'encoder-motion.cc' || echo '$(srcdir)/'`encoder-motion.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libde265_encoder_la-encoder-motion.Tpo $(DEPDIR)/libde265_encoder_la-encoder-motion.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='encoder-motion.cc' object='libde265_encoder_la-encoder-motion.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_encoder_la_CXXFLAGS) $(CXXFLAGS) -c -o libde265_encoder_la-encoder-motion.lo `test -f 'encoder-motion.cc' || echo '$(srcdir)/'`encoder-motion.cc
+
 libde265_encoder_la-encpicbuf.lo: encpicbuf.cc
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_encoder_la_CXXFLAGS) $(CXXFLAGS) -MT libde265_encoder_la-encpicbuf.lo -MD -MP -MF $(DEPDIR)/libde265_encoder_la-encpicbuf.Tpo -c -o libde265_encoder_la-encpicbuf.lo `test -f 'encpicbuf.cc' || echo '$(srcdir)/'`encpicbuf.cc
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libde265_encoder_la-encpicbuf.Tpo $(DEPDIR)/libde265_encoder_la-encpicbuf.Plo

libde265-1.0.3.tar.gz/libde265/encoder/algo/CMakeLists.txt -> libde265-1.0.5.tar.gz/libde265/encoder/algo/CMakeLists.txt Changed

libde265-1.0.3.tar.gz/libde265/encoder/algo/Makefile.am -> libde265-1.0.5.tar.gz/libde265/encoder/algo/Makefile.am Changed

libde265-1.0.3.tar.gz/libde265/encoder/algo/Makefile.in -> libde265-1.0.5.tar.gz/libde265/encoder/algo/Makefile.in Changed

libde265-1.0.3.tar.gz/libde265/encoder/algo/cb-mergeindex.cc -> libde265-1.0.5.tar.gz/libde265/encoder/algo/cb-mergeindex.cc Changed

libde265-1.0.3.tar.gz/libde265/encoder/algo/tb-intrapredmode.cc -> libde265-1.0.5.tar.gz/libde265/encoder/algo/tb-intrapredmode.cc Changed

libde265-1.0.3.tar.gz/libde265/encoder/algo/tb-split.cc -> libde265-1.0.5.tar.gz/libde265/encoder/algo/tb-split.cc Changed

libde265-1.0.3.tar.gz/libde265/encoder/encoder-context.cc -> libde265-1.0.5.tar.gz/libde265/encoder/encoder-context.cc Changed

@@ -43,7 +43,7 @@
   headers_have_been_sent = false;
 
   param_image_allocation_userdata = NULL;
-  release_func = NULL;
+  //release_func = NULL;
 
   use_adaptive_context = true; //false;
 
@@ -60,7 +60,7 @@
 encoder_context::~encoder_context()
 {
   while (!output_packets.empty()) {
-    en265_free_packet(this, output_packets.front());
+    en265_free_packet((en265_encoder_context*)this, output_packets.front());
     output_packets.pop_front();
   }
 }
@@ -112,7 +112,7 @@
   pck->nuh_layer_id = 0;
   pck->nuh_temporal_id = 0;
 
-  pck->encoder_context = this;
+  pck->encoder_context = (en265_encoder_context*)this;
 
   pck->input_image = NULL;
   pck->reconstruction = NULL;
@@ -156,7 +156,7 @@
   // PPS
 
   pps->set_defaults();
-  pps->sps = sps.get();
+  pps->sps = sps; //sps.get();
   pps->pic_init_qp = algo.getPPS_QP();
 
   // turn off deblocking filter
@@ -267,7 +267,7 @@
   imgdata->shdr.slice_loop_filter_across_slices_enabled_flag = false;
   imgdata->shdr.compute_derived_values(pps.get());
 
-  imgdata->shdr.pps = &get_pps();
+  imgdata->shdr.pps = pps;
 
   //shdr.slice_pic_order_cnt_lsb = poc & 0xFF;

libde265-1.0.3.tar.gz/libde265/encoder/encoder-context.h -> libde265-1.0.5.tar.gz/libde265/encoder/encoder-context.h Changed

libde265-1.0.3.tar.gz/libde265/encoder/encoder-core.cc -> libde265-1.0.5.tar.gz/libde265/encoder/encoder-core.cc Changed

libde265-1.0.5.tar.gz/libde265/encoder/encoder-intrapred.cc Added

@@ -0,0 +1,340 @@
+/*
+ * H.265 video codec.
+ * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+ *
+ * This file is part of libde265.
+ *
+ * libde265 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * libde265 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "intrapred.h"
+#include "encoder/encoder-intrapred.h"
+#include "encoder/encoder-types.h"
+#include "transform.h"
+#include "util.h"
+#include <assert.h>
+
+
+#include <sys/types.h>
+#include <string.h>
+
+
+void fillIntraPredModeCandidates(enum IntraPredMode candModeList[3],
+                                 int x,int y,
+                                 bool availableA, // left
+                                 bool availableB, // top
+                                 const CTBTreeMatrix& ctbs,
+                                 const seq_parameter_set* sps)
+{
+
+  // block on left side
+
+  enum IntraPredMode candIntraPredModeA, candIntraPredModeB;
+
+  if (availableA==false) {
+    candIntraPredModeA=INTRA_DC;
+  }
+  else {
+    const enc_cb* cbL = ctbs.getCB(x-1,y);
+    assert(cbL != NULL);
+
+    if (cbL->PredMode != MODE_INTRA ||
+        cbL->pcm_flag) {
+      candIntraPredModeA=INTRA_DC;
+    }
+    else {
+      const enc_tb* tbL = cbL->getTB(x-1,y);
+      assert(tbL);
+      candIntraPredModeA = tbL->intra_mode;
+    }
+  }
+
+  // block above
+
+  if (availableB==false) {
+    candIntraPredModeB=INTRA_DC;
+  }
+  else {
+    const enc_cb* cbA = ctbs.getCB(x,y-1);
+    assert(cbA != NULL);
+
+    if (cbA->PredMode != MODE_INTRA ||
+        cbA->pcm_flag) {
+      candIntraPredModeB=INTRA_DC;
+    }
+    else if (y-1 < ((y >> sps->Log2CtbSizeY) << sps->Log2CtbSizeY)) {
+      candIntraPredModeB=INTRA_DC;
+    }
+    else {
+      const enc_tb* tbA = cbA->getTB(x,y-1);
+      assert(tbA);
+
+      candIntraPredModeB = tbA->intra_mode;
+    }
+  }
+
+
+  logtrace(LogSlice,"%d;%d candA:%d / candB:%d\n", x,y,
+           availableA ? candIntraPredModeA : -999,
+           availableB ? candIntraPredModeB : -999);
+
+
+  fillIntraPredModeCandidates(candModeList,
+                              candIntraPredModeA,
+                              candIntraPredModeB);
+}
+
+
+template <class pixel_t>
+class intra_border_computer_ctbtree : public intra_border_computer<pixel_t>
+{
+public:
+  void fill_from_ctbtree(const enc_tb* tb,
+                         const CTBTreeMatrix& ctbs);
+};
+
+
+template <class pixel_t>
+void intra_border_computer_ctbtree<pixel_t>::fill_from_ctbtree(const enc_tb* blkTb,
+                                                               const CTBTreeMatrix& ctbs)
+{
+  int xBLuma = this->xB * this->SubWidth;
+  int yBLuma = this->yB * this->SubHeight;
+
+  int currBlockAddr = this->pps->MinTbAddrZS[ (xBLuma >> this->sps->Log2MinTrafoSize) +
+                                              (yBLuma >> this->sps->Log2MinTrafoSize) * this->sps->PicWidthInTbsY ];
+
+
+  // copy pixels at left column
+
+  for (int y=this->nBottom-1 ; y>=0 ; y-=4)
+    if (this->availableLeft)
+      {
+        int NBlockAddr = this->pps->MinTbAddrZS[ (((this->xB-1)*this->SubWidth )>>this->sps->Log2MinTrafoSize) +
+                                                 (((this->yB+y)*this->SubHeight)>>this->sps->Log2MinTrafoSize)
+                                                 * this->sps->PicWidthInTbsY ];
+
+        bool availableN = NBlockAddr <= currBlockAddr;
+
+        int xN = this->xB-1;
+        int yN = this->yB+y;
+
+        const enc_cb* cb = ctbs.getCB(xN*this->SubWidth, yN*this->SubHeight);
+
+        if (this->pps->constrained_intra_pred_flag) {
+          if (cb->PredMode != MODE_INTRA)
+            availableN = false;
+        }
+
+        if (availableN) {
+          PixelAccessor pa = cb->transform_tree->getPixels(xN,yN, this->cIdx, *this->sps);
+
+          if (!this->nAvail) this->firstValue = pa[this->yB+y][this->xB-1];
+
+          for (int i=0;i<4;i++) {
+            this->available[-y+i-1] = availableN;
+            this->out_border[-y+i-1] = pa[this->yB+y-i][this->xB-1];
+          }
+
+          this->nAvail+=4;
+        }
+      }
+
+  // copy pixel at top-left position
+
+  if (this->availableTopLeft)
+    {
+      int NBlockAddr = this->pps->MinTbAddrZS[ (((this->xB-1)*this->SubWidth )>>this->sps->Log2MinTrafoSize) +
+                                               (((this->yB-1)*this->SubHeight)>>this->sps->Log2MinTrafoSize)
+                                               * this->sps->PicWidthInTbsY ];
+
+      bool availableN = NBlockAddr <= currBlockAddr;
+
+      int xN = this->xB-1;
+      int yN = this->yB-1;
+
+      const enc_cb* cb = ctbs.getCB(xN*this->SubWidth, yN*this->SubHeight);
+
+      if (this->pps->constrained_intra_pred_flag) {
+        if (cb->PredMode!=MODE_INTRA) {
+          availableN = false;
+        }
+      }
+
+      if (availableN) {
+        PixelAccessor pa = cb->transform_tree->getPixels(xN,yN, this->cIdx, *this->sps);
+
+        this->out_border[0] = pa[this->yB-1][this->xB-1];
+        this->available[0] = availableN;
+
+        if (!this->nAvail) this->firstValue = this->out_border[0];
+        this->nAvail++;
+      }
+    }
+
+
+  // copy pixels at top row
+
+  for (int x=0 ; x<this->nRight ; x+=4) {
+    bool borderAvailable;
+    if (x<this->nT) borderAvailable = this->availableTop;
+    else            borderAvailable = this->availableTopRight;
+
+    if (borderAvailable)
+      {
+        int NBlockAddr = this->pps->MinTbAddrZS[ (((this->xB+x)*this->SubWidth )>>this->sps->Log2MinTrafoSize) +
+                                                 (((this->yB-1)*this->SubHeight)>>this->sps->Log2MinTrafoSize)
+                                                 * this->sps->PicWidthInTbsY ];
+

libde265-1.0.5.tar.gz/libde265/encoder/encoder-intrapred.h Added

@@ -0,0 +1,40 @@
+/*
+ * H.265 video codec.
+ * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+ *
+ * This file is part of libde265.
+ *
+ * libde265 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * libde265 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DE265_ENCODER_INTRAPRED_H
+#define DE265_ENCODER_INTRAPRED_H
+
+#include "libde265/decctx.h"
+
+
+void fillIntraPredModeCandidates(enum IntraPredMode candModeList[3],
+                                 int x,int y,
+                                 bool availableA, // left
+                                 bool availableB, // top
+                                 const class CTBTreeMatrix& ctbs,
+                                 const seq_parameter_set* sps);
+
+void decode_intra_prediction_from_tree(const de265_image* img,
+                                       const class enc_tb* tb,
+                                       const class CTBTreeMatrix& ctbs,
+                                       const class seq_parameter_set& sps,
+                                       int cIdx);
+
+#endif

libde265-1.0.5.tar.gz/libde265/encoder/encoder-motion.cc Added

@@ -0,0 +1,80 @@
+/*
+ * H.265 video codec.
+ * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+ *
+ * This file is part of libde265.
+ *
+ * libde265 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * libde265 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "encoder/encoder-motion.h"
+#include "encoder/encoder-context.h"
+#include "decctx.h"
+#include "util.h"
+#include "dpb.h"
+#include "motion.h"
+
+#include <assert.h>
+
+
+#include <sys/types.h>
+#include <signal.h>
+#include <string.h>
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+# include <malloc.h>
+#elif defined(HAVE_ALLOCA_H)
+# include <alloca.h>
+#endif
+
+
+class MotionVectorAccess_encoder_context : public MotionVectorAccess
+{
+public:
+  MotionVectorAccess_encoder_context(const encoder_context* e) : ectx(e) { }
+
+  enum PartMode get_PartMode(int x,int y) const override { return ectx->ctbs.getCB(x,y)->PartMode; }
+  const PBMotion& get_mv_info(int x,int y) const override { return ectx->ctbs.getPB(x,y)->motion; }
+
+private:
+  const encoder_context* ectx;
+};
+
+
+
+void get_merge_candidate_list_from_tree(encoder_context* ectx,
+                                        const slice_segment_header* shdr,
+                                        int xC,int yC, int xP,int yP,
+                                        int nCS, int nPbW,int nPbH, int partIdx,
+                                        PBMotion* mergeCandList)
+{
+  int max_merge_idx = 5-shdr->five_minus_max_num_merge_cand -1;
+
+  get_merge_candidate_list_without_step_9(ectx, shdr,
+                                          MotionVectorAccess_encoder_context(ectx), ectx->img,
+                                          xC,yC,xP,yP,nCS,nPbW,nPbH, partIdx,
+                                          max_merge_idx, mergeCandList);
+
+  // 9. for encoder: modify all merge candidates
+
+  for (int i=0;i<=max_merge_idx;i++) {
+    if (mergeCandList[i].predFlag[0] &&
+        mergeCandList[i].predFlag[1] &&
+        nPbW+nPbH==12)
+      {
+        mergeCandList[i].refIdx[1]   = -1;
+        mergeCandList[i].predFlag[1] = 0;
+      }
+  }
+}

libde265-1.0.5.tar.gz/libde265/encoder/encoder-motion.h Added

@@ -0,0 +1,32 @@
+/*
+ * H.265 video codec.
+ * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+ *
+ * This file is part of libde265.
+ *
+ * libde265 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * libde265 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DE265_ENCODER_MOTION_H
+#define DE265_ENCODER_MOTION_H
+
+#include "libde265/motion.h"
+
+void get_merge_candidate_list_from_tree(class encoder_context* ectx,
+                                        const slice_segment_header* shdr,
+                                        int xC,int yC, int xP,int yP,
+                                        int nCS, int nPbW,int nPbH, int partIdx,
+                                        PBMotion* mergeCandList);
+
+#endif

libde265-1.0.3.tar.gz/libde265/encoder/encoder-syntax.cc -> libde265-1.0.5.tar.gz/libde265/encoder/encoder-syntax.cc Changed

libde265-1.0.3.tar.gz/libde265/encoder/sop.h -> libde265-1.0.5.tar.gz/libde265/encoder/sop.h Changed

libde265-1.0.3.tar.gz/libde265/image-io.cc -> libde265-1.0.5.tar.gz/libde265/image-io.cc Changed

@@ -67,7 +67,7 @@
 
   de265_image* img = new de265_image;
   img->alloc_image(width,height,de265_chroma_420, NULL, false,
-                   NULL, NULL, 0, NULL, false);
+                   NULL, /*NULL,*/ 0, NULL, false);
   assert(img); // TODO: error handling
 
   // --- load image ---
@@ -161,17 +161,20 @@
 
   p = img->get_image_plane(0);  stride = img->get_image_stride(0);
   for (int y=0;y<height;y++) {
-    fwrite(p+y*stride,1,width,mFH);
+    size_t n = fwrite(p+y*stride,1,width,mFH);
+    (void)n;
   }
 
   p = img->get_image_plane(1);  stride = img->get_image_stride(1);
   for (int y=0;y<height/2;y++) {
-    fwrite(p+y*stride,1,width/2,mFH);
+    size_t n = fwrite(p+y*stride,1,width/2,mFH);
+    (void)n;
   }
 
   p = img->get_image_plane(2);  stride = img->get_image_stride(2);
   for (int y=0;y<height/2;y++) {
-    fwrite(p+y*stride,1,width/2,mFH);
+    size_t n = fwrite(p+y*stride,1,width/2,mFH);
+    (void)n;
   }
 }
 
@@ -206,7 +209,12 @@
   startCode[1] = 0;
   startCode[2] = 1;
 
-  fwrite(startCode,1,3,mFH);
-  fwrite(data,1,n,mFH);
+  size_t dummy;
+  dummy = fwrite(startCode,1,3,mFH);
+  (void)dummy;
+
+  dummy = fwrite(data,1,n,mFH);
+  (void)dummy;
+
   fflush(mFH);
 }

libde265-1.0.3.tar.gz/libde265/image.cc -> libde265-1.0.5.tar.gz/libde265/image.cc Changed

@@ -20,7 +20,6 @@
 
 #include "image.h"
 #include "decctx.h"
-#include "encoder/encoder-context.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +33,9 @@
 #endif
 
 #ifdef HAVE_SSE4_1
-#define MEMORY_PADDING  8
+// SSE code processes 128bit per iteration and thus might read more data
+// than is later actually used.
+#define MEMORY_PADDING  16
 #else
 #define MEMORY_PADDING  0
 #endif
@@ -191,9 +192,9 @@
   removed_at_picture_id = 0; // picture not used, so we can assume it has been removed
 
   decctx = NULL;
-  encctx = NULL;
+  //encctx = NULL;
 
-  encoder_image_release_func = NULL;
+  //encoder_image_release_func = NULL;
 
   //alloc_functions.get_buffer = NULL;
   //alloc_functions.release_buffer = NULL;
@@ -232,7 +233,7 @@
 de265_error de265_image::alloc_image(int w,int h, enum de265_chroma c,
                                      std::shared_ptr<const seq_parameter_set> sps, bool allocMetadata,
                                      decoder_context* dctx,
-                                     encoder_context* ectx,
+                                     //encoder_context* ectx,
                                      de265_PTS pts, void* user_data,
                                      bool useCustomAllocFunc)
 {
@@ -249,7 +250,7 @@
   removed_at_picture_id = std::numeric_limits<int32_t>::max();
 
   decctx = dctx;
-  encctx = ectx;
+  //encctx = ectx;
 
   // --- allocate image buffer ---
 
@@ -311,7 +312,7 @@
     break;
   }
 
-  if (sps) {
+  if (chroma_format != de265_chroma_mono && sps) {
     assert(sps->SubWidthC  == SubWidthC);
     assert(sps->SubHeightC == SubHeightC);
   }
@@ -354,8 +355,9 @@
 
   void* alloc_userdata = NULL;
   if (decctx) alloc_userdata = decctx->param_image_allocation_userdata;
-  if (encctx) alloc_userdata = encctx->param_image_allocation_userdata; // actually not needed
+  // if (encctx) alloc_userdata = encctx->param_image_allocation_userdata; // actually not needed
 
+  /*
   if (encctx && useCustomAllocFunc) {
     encoder_image_release_func = encctx->release_func;
 
@@ -369,7 +371,7 @@
       image_allocation_functions.release_buffer = NULL;
     }
   }
-  else if (decctx && useCustomAllocFunc) {
+  else*/ if (decctx && useCustomAllocFunc) {
     image_allocation_functions = decctx->param_image_allocation_functions;
   }
   else {
@@ -383,9 +385,15 @@
                                                               alloc_userdata);
 
     pixels_confwin[0] = pixels[0] + left*WinUnitX + top*WinUnitY*stride;
-    pixels_confwin[1] = pixels[1] + left + top*chroma_stride;
-    pixels_confwin[2] = pixels[2] + left + top*chroma_stride;
 
+    if (chroma_format != de265_chroma_mono) {
+      pixels_confwin[1] = pixels[1] + left + top*chroma_stride;
+      pixels_confwin[2] = pixels[2] + left + top*chroma_stride;
+    }
+    else {
+      pixels_confwin[1] = NULL;
+      pixels_confwin[2] = NULL;
+    }
 
     // check for memory shortage
 
@@ -480,13 +488,14 @@
 
   if (pixels[0])
     {
+      /*
       if (encoder_image_release_func != NULL) {
         encoder_image_release_func(encctx, this,
                                    encctx->param_image_allocation_userdata);
       }
-      else {
+      else*/ {
         image_allocation_functions.release_buffer(decctx, this,
-                                                decctx ?
+                                                  decctx ?
                                                   decctx->param_image_allocation_userdata :
                                                   NULL);
       }
@@ -532,7 +541,7 @@
   */
 
   de265_error err = alloc_image(src->width, src->height, src->chroma_format, src->sps, false,
-                                src->decctx, src->encctx, src->pts, src->user_data, false);
+                                src->decctx, /*src->encctx,*/ src->pts, src->user_data, false);
   if (err != DE265_OK) {
     return err;
   }

libde265-1.0.3.tar.gz/libde265/image.h -> libde265-1.0.5.tar.gz/libde265/image.h Changed

@@ -35,7 +35,6 @@
 #endif
 
 #include "libde265/de265.h"
-#include "libde265/en265.h"
 #include "libde265/sps.h"
 #include "libde265/pps.h"
 #include "libde265/motion.h"
@@ -43,6 +42,8 @@
 #include "libde265/slice.h"
 #include "libde265/nal.h"
 
+struct en265_encoder_context;
+
 enum PictureState {
   UnusedForReference,
   UsedForShortTermReference,
@@ -227,7 +228,7 @@
                           std::shared_ptr<const seq_parameter_set> sps,
                           bool allocMetadata,
                           decoder_context* dctx,
-                          class encoder_context* ectx,
+                          //class encoder_context* ectx,
                           de265_PTS pts, void* user_data,
                           bool useCustomAllocFunctions);
 
@@ -396,7 +397,7 @@
   //std::shared_ptr<const pic_parameter_set> get_shared_pps() const { return pps; }
 
   decoder_context*    decctx;
-  class encoder_context*    encctx;
+  //class encoder_context*    encctx;
 
   int number_of_ctbs() const { return ctb_info.size(); }
 
@@ -423,9 +424,12 @@
   void*     user_data;
   void*     plane_user_data[3];  // this is logically attached to the pixel data pointers
   de265_image_allocation image_allocation_functions; // the functions used for memory allocation
+
+  /*
   void (*encoder_image_release_func)(en265_encoder_context*,
                                      de265_image*,
                                      void* userdata);
+  */
 
   uint8_t integrity; /* Whether an error occured while the image was decoded.
                         When generated, this is initialized to INTEGRITY_CORRECT,

libde265-1.0.3.tar.gz/libde265/intrapred.cc -> libde265-1.0.5.tar.gz/libde265/intrapred.cc Changed

@@ -21,42 +21,12 @@
 #include "intrapred.h"
 #include "transform.h"
 #include "util.h"
-#include "encoder/encoder-types.h"
 #include <assert.h>
 
 
 #include <sys/types.h>
 #include <string.h>
 
-// Actually, the largest TB block can only be 32, but in some intra-pred-mode algorithms
-// (e.g. min-residual), we may call intra prediction on the maximum CTB size (64).
-static const int MAX_INTRA_PRED_BLOCK_SIZE = 64;
-
-
-
-#ifdef DE265_LOG_TRACE
-template <class pixel_t>
-void print_border(pixel_t* data, uint8_t* available, int nT)
-{
-  for (int i=-2*nT ; i<=2*nT ; i++) {
-    if (i==0 || i==1 || i==-nT || i==nT+1) {
-      logtrace(LogIntraPred,"|");
-    } else {
-      logtrace(LogIntraPred," ");
-    }
-
-    if (available==NULL || available[i]) {
-      logtrace(LogIntraPred,"%02x",data[i]);
-    }
-    else {
-      logtrace(LogIntraPred,"--");
-    }
-  }
-}
-#else
-#define print_border(data, available, nT)
-#endif
-
 
 
 void fillIntraPredModeCandidates(enum IntraPredMode candModeList[3],
@@ -153,72 +123,6 @@
 }
 
 
-void fillIntraPredModeCandidates(enum IntraPredMode candModeList[3],
-                                 int x,int y,
-                                 bool availableA, // left
-                                 bool availableB, // top
-                                 const CTBTreeMatrix& ctbs,
-                                 const seq_parameter_set* sps)
-{
-
-  // block on left side
-
-  enum IntraPredMode candIntraPredModeA, candIntraPredModeB;
-
-  if (availableA==false) {
-    candIntraPredModeA=INTRA_DC;
-  }
-  else {
-    const enc_cb* cbL = ctbs.getCB(x-1,y);
-    assert(cbL != NULL);
-
-    if (cbL->PredMode != MODE_INTRA ||
-        cbL->pcm_flag) {
-      candIntraPredModeA=INTRA_DC;
-    }
-    else {
-      const enc_tb* tbL = cbL->getTB(x-1,y);
-      assert(tbL);
-      candIntraPredModeA = tbL->intra_mode;
-    }
-  }
-
-  // block above
-
-  if (availableB==false) {
-    candIntraPredModeB=INTRA_DC;
-  }
-  else {
-    const enc_cb* cbA = ctbs.getCB(x,y-1);
-    assert(cbA != NULL);
-
-    if (cbA->PredMode != MODE_INTRA ||
-        cbA->pcm_flag) {
-      candIntraPredModeB=INTRA_DC;
-    }
-    else if (y-1 < ((y >> sps->Log2CtbSizeY) << sps->Log2CtbSizeY)) {
-      candIntraPredModeB=INTRA_DC;
-    }
-    else {
-      const enc_tb* tbA = cbA->getTB(x,y-1);
-      assert(tbA);
-
-      candIntraPredModeB = tbA->intra_mode;
-    }
-  }
-
-
-  logtrace(LogSlice,"%d;%d candA:%d / candB:%d\n", x,y,
-           availableA ? candIntraPredModeA : -999,
-           availableB ? candIntraPredModeB : -999);
-
-
-  fillIntraPredModeCandidates(candModeList,
-                              candIntraPredModeA,
-                              candIntraPredModeB);
-}
-
-
 int find_intra_pred_mode(enum IntraPredMode mode,
                          enum IntraPredMode candModeList[3])
 {
@@ -341,190 +245,6 @@
 }
 
 
-template <class pixel_t>
-struct intra_border_computer
-{
-  pixel_t* out_border;
-
-  const de265_image* img;
-  int nT;
-  int cIdx;
-
-  int xB,yB;
-
-  const seq_parameter_set* sps;
-  const pic_parameter_set* pps;
-
-  uint8_t available_data[4*MAX_INTRA_PRED_BLOCK_SIZE + 1];
-  uint8_t* available;
-
-  int SubWidth;
-  int SubHeight;
-
-  bool availableLeft;    // is CTB at left side available?
-  bool availableTop;     // is CTB at top side available?
-  bool availableTopRight; // is CTB at top-right side available?
-  bool availableTopLeft;  // if CTB at top-left pixel available?
-
-  int nBottom;
-  int nRight;
-  int nAvail;
-  pixel_t firstValue;
-
-  void init(pixel_t* _out_border,
-            const de265_image* _img, int _nT, int _cIdx, int _xB, int _yB) {
-    img=_img; nT=_nT; cIdx=_cIdx;
-    out_border=_out_border; xB=_xB; yB=_yB;
-
-    assert(nT <= MAX_INTRA_PRED_BLOCK_SIZE);
-
-    availableLeft=true;
-    availableTop=true;
-    availableTopRight=true;
-    availableTopLeft=true;
-  }
-  void preproc();
-  void fill_from_image();
-  void fill_from_ctbtree(const enc_tb* tb,
-                         const CTBTreeMatrix& ctbs);
-  void reference_sample_substitution();
-};
-
-
-template <class pixel_t>
-void intra_border_computer<pixel_t>::reference_sample_substitution()
-{
-  // reference sample substitution
-
-  const int bit_depth = img->get_bit_depth(cIdx);
-
-  if (nAvail!=4*nT+1) {
-    if (nAvail==0) {
-      if (sizeof(pixel_t)==1) {
-        memset(out_border-2*nT, 1<<(bit_depth-1), 4*nT+1);
-      }
-      else {
-        for (int i = -2*nT; i <= 2*nT ; i++) {
-          out_border[i] = 1<<(bit_depth-1);
-        }
-      }
-    }
-    else {
-      if (!available[-2*nT]) {
-        out_border[-2*nT] = firstValue;
-      }
-
-      for (int i=-2*nT+1; i<=2*nT; i++)
-        if (!available[i]) {
-          out_border[i]=out_border[i-1];
-        }
-    }
-  }
-

libde265-1.0.3.tar.gz/libde265/intrapred.h -> libde265-1.0.5.tar.gz/libde265/intrapred.h Changed

@@ -47,14 +47,9 @@
   fillIntraPredModeCandidates(candModeList, x,y, PUidx, availableA,availableB, img);
 }
 
-
 void fillIntraPredModeCandidates(enum IntraPredMode candModeList[3],
-                                 int x,int y,
-                                 bool availableA, // left
-                                 bool availableB, // top
-                                 const class CTBTreeMatrix& ctbs,
-                                 const seq_parameter_set* sps);
-
+                                 enum IntraPredMode candIntraPredModeA,
+                                 enum IntraPredMode candIntraPredModeB);
 
 
 /* Return value >= 0 -> use mpm_idx(return value)
@@ -96,16 +91,588 @@
                              enum IntraPredMode intraPredMode,
                              int nT, int cIdx);
 
-void decode_intra_prediction_from_tree(const de265_image* img,
-                                       const class enc_tb* tb,
-                                       const class CTBTreeMatrix& ctbs,
-                                       const class seq_parameter_set& sps,
-                                       int cIdx);
-
 // TODO: remove this
 template <class pixel_t> void decode_intra_prediction(de265_image* img,
                                                       int xB0,int yB0,
                                                       enum IntraPredMode intraPredMode,
                                                       pixel_t* dst, int nT, int cIdx);
 
+
+
+
+// --- internal use only ---
+
+// Actually, the largest TB block can only be 32, but in some intra-pred-mode algorithms
+// (e.g. min-residual), we may call intra prediction on the maximum CTB size (64).
+static const int MAX_INTRA_PRED_BLOCK_SIZE = 64;
+
+
+template <class pixel_t>
+class intra_border_computer
+{
+ public:
+  pixel_t* out_border;
+
+  const de265_image* img;
+  int nT;
+  int cIdx;
+
+  int xB,yB;
+
+  const seq_parameter_set* sps;
+  const pic_parameter_set* pps;
+
+  uint8_t available_data[4*MAX_INTRA_PRED_BLOCK_SIZE + 1];
+  uint8_t* available;
+
+  int SubWidth;
+  int SubHeight;
+
+  bool availableLeft;    // is CTB at left side available?
+  bool availableTop;     // is CTB at top side available?
+  bool availableTopRight; // is CTB at top-right side available?
+  bool availableTopLeft;  // if CTB at top-left pixel available?
+
+  int nBottom;
+  int nRight;
+  int nAvail;
+  pixel_t firstValue;
+
+  void init(pixel_t* _out_border,
+            const de265_image* _img, int _nT, int _cIdx, int _xB, int _yB) {
+    img=_img; nT=_nT; cIdx=_cIdx;
+    out_border=_out_border; xB=_xB; yB=_yB;
+
+    assert(nT <= MAX_INTRA_PRED_BLOCK_SIZE);
+
+    availableLeft=true;
+    availableTop=true;
+    availableTopRight=true;
+    availableTopLeft=true;
+  }
+  void preproc();
+  void fill_from_image();
+
+  void reference_sample_substitution();
+};
+
+
+#ifdef DE265_LOG_TRACE
+template <class pixel_t>
+void print_border(pixel_t* data, uint8_t* available, int nT)
+{
+  for (int i=-2*nT ; i<=2*nT ; i++) {
+    if (i==0 || i==1 || i==-nT || i==nT+1) {
+      logtrace(LogIntraPred,"|");
+    } else {
+      logtrace(LogIntraPred," ");
+    }
+
+    if (available==NULL || available[i]) {
+      logtrace(LogIntraPred,"%02x",data[i]);
+    }
+    else {
+      logtrace(LogIntraPred,"--");
+    }
+  }
+}
+#else
+#define print_border(data, available, nT)
+#endif
+
+
+// (8.4.4.2.3)
+template <class pixel_t>
+void intra_prediction_sample_filtering(const seq_parameter_set& sps,
+                                       pixel_t* p,
+                                       int nT, int cIdx,
+                                       enum IntraPredMode intraPredMode)
+{
+  int filterFlag;
+
+  //printf("filtering, mode: %d\n",intraPredMode);
+
+  if (intraPredMode==INTRA_DC || nT==4) {
+    filterFlag = 0;
+  } else {
+    // int-cast below prevents a typing problem that leads to wrong results when abs_value is a macro
+    int minDistVerHor = libde265_min( abs_value((int)intraPredMode-26),
+                                      abs_value((int)intraPredMode-10) );
+
+    //printf("mindist: %d\n",minDistVerHor);
+
+    switch (nT) {
+    case 8:  filterFlag = (minDistVerHor>7) ? 1 : 0; break;
+    case 16: filterFlag = (minDistVerHor>1) ? 1 : 0; break;
+    case 32: filterFlag = (minDistVerHor>0) ? 1 : 0; break;
+      // there is no official 64x64 TB block, but we call this for some intra-pred mode algorithms
+      // on the whole CB (2Nx2N mode for the whole CTB)
+    case 64: filterFlag = 0; break;
+    default: filterFlag = -1; assert(false); break; // should never happen
+    }
+  }
+
+
+  if (filterFlag) {
+    int biIntFlag = (sps.strong_intra_smoothing_enable_flag &&
+                     cIdx==0 &&
+                     nT==32 &&
+                     abs_value(p[0]+p[ 64]-2*p[ 32]) < (1<<(sps.bit_depth_luma-5)) &&
+                     abs_value(p[0]+p[-64]-2*p[-32]) < (1<<(sps.bit_depth_luma-5)))
+      ? 1 : 0;
+
+    pixel_t  pF_mem[4*32+1];
+    pixel_t* pF = &pF_mem[2*32];
+
+    if (biIntFlag) {
+      pF[-2*nT] = p[-2*nT];
+      pF[ 2*nT] = p[ 2*nT];
+      pF[    0] = p[    0];
+
+      for (int i=1;i<=63;i++) {
+        pF[-i] = p[0] + ((i*(p[-64]-p[0])+32)>>6);
+        pF[ i] = p[0] + ((i*(p[ 64]-p[0])+32)>>6);
+      }
+    } else {
+      pF[-2*nT] = p[-2*nT];
+      pF[ 2*nT] = p[ 2*nT];
+
+      for (int i=-(2*nT-1) ; i<=2*nT-1 ; i++)
+        {
+          pF[i] = (p[i+1] + 2*p[i] + p[i-1] + 2) >> 2;
+        }
+    }
+
+
+    // copy back to original array
+
+    memcpy(p-2*nT, pF-2*nT, (4*nT+1) * sizeof(pixel_t));
+  }
+  else {
+    // do nothing ?
+  }
+
+
+  logtrace(LogIntraPred,"post filtering: ");
+  print_border(p,NULL,nT);
+  logtrace(LogIntraPred,"\n");
+}
+
+
+template <class pixel_t>
+void intra_prediction_planar(pixel_t* dst, int dstStride,
+                             int nT,int cIdx,
+                             pixel_t* border)
+{

libde265-1.0.3.tar.gz/libde265/motion.cc -> libde265-1.0.5.tar.gz/libde265/motion.cc Changed

@@ -22,7 +22,6 @@
 #include "decctx.h"
 #include "util.h"
 #include "dpb.h"
-#include "encoder/encoder-context.h"
 
 #include <assert.h>
 
@@ -290,8 +289,8 @@
   void*  pixels[3];
   int    stride[3];
 
-  const pic_parameter_set* pps = shdr->pps;
-  const seq_parameter_set* sps = pps->sps;
+  const pic_parameter_set* pps = shdr->pps.get();
+  const seq_parameter_set* sps = pps->sps.get();
 
   const int SubWidthC  = sps->SubWidthC;
   const int SubHeightC = sps->SubHeightC;
@@ -349,7 +348,7 @@
 
       logtrace(LogMotion, "refIdx: %d -> dpb[%d]\n", vi->refIdx[l], shdr->RefPicList[l][vi->refIdx[l]]);
 
-      if (refPic->PicState == UnusedForReference) {
+      if (!refPic || refPic->PicState == UnusedForReference) {
         img->integrity = INTEGRITY_DECODING_ERRORS;
         ctx->add_warning(DE265_WARNING_NONEXISTING_REFERENCE_PICTURE_ACCESSED, false);
 
@@ -698,42 +697,19 @@
 }
 
 
-// TODO: add specializations for de265_image and encoder_context
-template <class T> class MotionVectorAccess
+class MotionVectorAccess_de265_image : public MotionVectorAccess
 {
 public:
-  enum PartMode get_PartMode(int x,int y);
-  const PBMotion& get_mv_info(int x,int y);
-};
-
-
-template <> class MotionVectorAccess<de265_image>
-{
-public:
-  MotionVectorAccess(const de265_image* i) : img(i) { }
+  MotionVectorAccess_de265_image(const de265_image* i) : img(i) { }
 
-  enum PartMode get_PartMode(int x,int y) { return img->get_PartMode(x,y); }
-  const PBMotion& get_mv_info(int x,int y) { return img->get_mv_info(x,y); }
+  enum PartMode get_PartMode(int x,int y) const override { return img->get_PartMode(x,y); }
+  const PBMotion& get_mv_info(int x,int y) const override { return img->get_mv_info(x,y); }
 
 private:
   const de265_image* img;
 };
 
 
-template <> class MotionVectorAccess<encoder_context>
-{
-public:
-  MotionVectorAccess(const encoder_context* e) : ectx(e) { }
-
-  enum PartMode get_PartMode(int x,int y) { return ectx->ctbs.getCB(x,y)->PartMode; }
-  const PBMotion& get_mv_info(int x,int y) {
-    return ectx->ctbs.getPB(x,y)->motion;
-  }
-
-private:
-  const encoder_context* ectx;
-};
-
 
 /*
   +--+                +--+--+
@@ -778,9 +754,8 @@
   second part to the parameters of the first part, since then, we could use 2Nx2N
   right away. -> Exclude this candidate.
 */
-template <class MVAccessType>
 int derive_spatial_merging_candidates(//const de265_image* img,
-                                      MotionVectorAccess<MVAccessType> mvaccess,
+                                      const MotionVectorAccess& mvaccess,
                                       const de265_image* img,
                                       int xC, int yC, int nCS, int xP, int yP,
                                       uint8_t singleMCLFlag,
@@ -1449,10 +1424,9 @@
 
 // 8.5.3.1.1
 
-template <class MVAccess>
 void get_merge_candidate_list_without_step_9(base_context* ctx,
                                              const slice_segment_header* shdr,
-                                             MotionVectorAccess<MVAccess> mvaccess,
+                                             const MotionVectorAccess& mvaccess,
                                              de265_image* img,
                                              int xC,int yC, int xP,int yP,
                                              int nCS, int nPbW,int nPbH, int partIdx,
@@ -1562,7 +1536,7 @@
   int max_merge_idx = 5-shdr->five_minus_max_num_merge_cand -1;
 
   get_merge_candidate_list_without_step_9(ctx, shdr,
-                                          MotionVectorAccess<de265_image>(img), img,
+                                          MotionVectorAccess_de265_image(img), img,
                                           xC,yC,xP,yP,nCS,nPbW,nPbH, partIdx,
                                           max_merge_idx, mergeCandList);
 
@@ -1580,34 +1554,6 @@
 }
 
 
-void get_merge_candidate_list_from_tree(encoder_context* ectx,
-                                        const slice_segment_header* shdr,
-                                        int xC,int yC, int xP,int yP,
-                                        int nCS, int nPbW,int nPbH, int partIdx,
-                                        PBMotion* mergeCandList)
-{
-  int max_merge_idx = 5-shdr->five_minus_max_num_merge_cand -1;
-
-  get_merge_candidate_list_without_step_9(ectx, shdr,
-                                          MotionVectorAccess<encoder_context>(ectx), ectx->img,
-                                          xC,yC,xP,yP,nCS,nPbW,nPbH, partIdx,
-                                          max_merge_idx, mergeCandList);
-
-  // 9. for encoder: modify all merge candidates
-
-  for (int i=0;i<=max_merge_idx;i++) {
-    if (mergeCandList[i].predFlag[0] &&
-        mergeCandList[i].predFlag[1] &&
-        nPbW+nPbH==12)
-      {
-        mergeCandList[i].refIdx[1]   = -1;
-        mergeCandList[i].predFlag[1] = 0;
-      }
-  }
-}
-
-
-
 void derive_luma_motion_merge_mode(base_context* ctx,
                                    const slice_segment_header* shdr,
                                    de265_image* img,
@@ -1619,7 +1565,7 @@
   PBMotion mergeCandList[5];
 
   get_merge_candidate_list_without_step_9(ctx, shdr,
-                                          MotionVectorAccess<de265_image>(img), img,
+                                          MotionVectorAccess_de265_image(img), img,
                                           xC,yC,xP,yP,nCS,nPbW,nPbH, partIdx,
                                           merge_idx, mergeCandList);

libde265-1.0.3.tar.gz/libde265/motion.h -> libde265-1.0.5.tar.gz/libde265/motion.h Changed

@@ -22,6 +22,7 @@
 #define DE265_MOTION_H
 
 #include <stdint.h>
+#include "slice.h"
 
 class base_context;
 class slice_segment_header;
@@ -73,12 +74,6 @@
                               int nCS, int nPbW,int nPbH, int partIdx,
                               PBMotion* mergeCandList);
 
-void get_merge_candidate_list_from_tree(class encoder_context* ectx,
-                                        const slice_segment_header* shdr,
-                                        int xC,int yC, int xP,int yP,
-                                        int nCS, int nPbW,int nPbH, int partIdx,
-                                        PBMotion* mergeCandList);
-
 /*
 int derive_spatial_merging_candidates(const struct de265_image* img,
                                       int xC, int yC, int nCS, int xP, int yP,
@@ -113,4 +108,24 @@
                             de265_image* img, const PBMotionCoding& motion,
                             int xC,int yC, int xB,int yB, int nCS, int nPbW,int nPbH, int partIdx);
 
+
+
+
+class MotionVectorAccess
+{
+public:
+  virtual enum PartMode get_PartMode(int x,int y) const = 0;
+  virtual const PBMotion& get_mv_info(int x,int y) const = 0;
+};
+
+
+void get_merge_candidate_list_without_step_9(base_context* ctx,
+                                             const slice_segment_header* shdr,
+                                             const MotionVectorAccess& mvaccess,
+                                             de265_image* img,
+                                             int xC,int yC, int xP,int yP,
+                                             int nCS, int nPbW,int nPbH, int partIdx,
+                                             int max_merge_idx,
+                                             PBMotion* mergeCandList);
+
 #endif

libde265-1.0.3.tar.gz/libde265/pps.cc -> libde265-1.0.5.tar.gz/libde265/pps.cc Changed

libde265-1.0.3.tar.gz/libde265/pps.h -> libde265-1.0.5.tar.gz/libde265/pps.h Changed

libde265-1.0.3.tar.gz/libde265/sao.cc -> libde265-1.0.5.tar.gz/libde265/sao.cc Changed

@@ -211,11 +211,14 @@
             continue;
           }
 
-          int bandIdx = bandTable[ in_img[xC+i+(yC+j)*in_stride]>>bandShift ];
-
           // Shifts are a strange thing. On x86, >>x actually computes >>(x%64).
           // So we have to take care of large bandShifts.
-          if (bandShift>=8) { bandIdx=0; }
+          int bandIdx;
+          if (bandShift >= 8) {
+            bandIdx = 0;
+          } else {
+            bandIdx = bandTable[ in_img[xC+i+(yC+j)*in_stride]>>bandShift ];
+          }
 
           if (bandIdx>0) {
             int offset = saoinfo->saoOffsetVal[cIdx][bandIdx-1];
@@ -237,10 +240,13 @@
         for (int j=0;j<ctbH;j++)
           for (int i=0;i<ctbW;i++) {
 
-            int bandIdx = bandTable[ in_img[xC+i+(yC+j)*in_stride]>>bandShift ];
-
             // see above
-            if (bandShift>=8) { bandIdx=0; }
+            int bandIdx;
+            if (bandShift >= 8) {
+              bandIdx = 0;
+            } else {
+              bandIdx = bandTable[ in_img[xC+i+(yC+j)*in_stride]>>bandShift ];
+            }
 
             if (bandIdx>0) {
               int offset = saoinfo->saoOffsetVal[cIdx][bandIdx-1];
@@ -481,7 +487,7 @@
                                                     img->get_chroma_format(),
                                                     img->get_shared_sps(),
                                                     false,
-                                                    img->decctx, img->encctx,
+                                                    img->decctx, //img->encctx,
                                                     img->pts, img->user_data, true);
   if (err != DE265_OK) {
     img->decctx->add_warning(DE265_WARNING_CANNOT_APPLY_SAO_OUT_OF_MEMORY,false);

libde265-1.0.3.tar.gz/libde265/sei.cc -> libde265-1.0.5.tar.gz/libde265/sei.cc Changed

@@ -311,7 +311,9 @@
 
         for (int b=0;b<16;b++) {
           if (md5[b] != seihash->md5[i][b]) {
+/*
             fprintf(stderr,"SEI decoded picture MD5 mismatch (POC=%d)\n", img->PicOrderCntVal);
+*/
             return DE265_ERROR_CHECKSUM_MISMATCH;
           }
         }
@@ -326,8 +328,10 @@
                  seihash->crc[i], i, crc);
 
         if (crc != seihash->crc[i]) {
+/*
           fprintf(stderr,"SEI decoded picture hash: %04x, decoded picture: %04x (POC=%d)\n",
                   seihash->crc[i], crc, img->PicOrderCntVal);
+*/
           return DE265_ERROR_CHECKSUM_MISMATCH;
         }
       }
@@ -338,8 +342,10 @@
         uint32_t chksum = compute_checksum_8bit(data,w,h,stride, img->get_bit_depth(i));
 
         if (chksum != seihash->checksum[i]) {
+/*
           fprintf(stderr,"SEI decoded picture hash: %04x, decoded picture: %04x (POC=%d)\n",
                   seihash->checksum[i], chksum, img->PicOrderCntVal);
+*/
           return DE265_ERROR_CHECKSUM_MISMATCH;
         }
       }

libde265-1.0.3.tar.gz/libde265/slice.cc -> libde265-1.0.5.tar.gz/libde265/slice.cc Changed

libde265-1.0.3.tar.gz/libde265/slice.h -> libde265-1.0.5.tar.gz/libde265/slice.h Changed

libde265-1.0.3.tar.gz/libde265/sps.cc -> libde265-1.0.5.tar.gz/libde265/sps.cc Changed

libde265-1.0.3.tar.gz/libde265/threads.h -> libde265-1.0.5.tar.gz/libde265/threads.h Changed

libde265-1.0.3.tar.gz/libde265/transform.cc -> libde265-1.0.5.tar.gz/libde265/transform.cc Changed

libde265-1.0.3.tar.gz/libde265/vps.cc -> libde265-1.0.5.tar.gz/libde265/vps.cc Changed

libde265-1.0.3.tar.gz/libde265/x86/CMakeLists.txt -> libde265-1.0.5.tar.gz/libde265/x86/CMakeLists.txt Changed

libde265-1.0.3.tar.gz/libde265/x86/Makefile.am -> libde265-1.0.5.tar.gz/libde265/x86/Makefile.am Changed

libde265-1.0.3.tar.gz/libde265/x86/Makefile.in -> libde265-1.0.5.tar.gz/libde265/x86/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -356,13 +356,14 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libde265_x86.la  libde265_x86_sse.la
-libde265_x86_la_CXXFLAGS = -I.. $(CFLAG_VISIBILITY) $(am__append_1)
+libde265_x86_la_CXXFLAGS = -I$(top_srcdir)/libde265 \
+	$(CFLAG_VISIBILITY) $(am__append_1)
 libde265_x86_la_SOURCES = sse.cc sse.h
 libde265_x86_la_LIBADD = libde265_x86_sse.la
 
 # SSE4 specific functions
-libde265_x86_sse_la_CXXFLAGS = -msse4.1 -I.. $(CFLAG_VISIBILITY) \
-	$(am__append_2)
+libde265_x86_sse_la_CXXFLAGS = -msse4.1 -I$(top_srcdir) \
+	-I$(top_srcdir)/libde265 $(CFLAG_VISIBILITY) $(am__append_2)
 libde265_x86_sse_la_SOURCES = sse-motion.cc sse-motion.h sse-dct.h sse-dct.cc
 EXTRA_DIST = \
   CMakeLists.txt

libde265-1.0.3.tar.gz/ltmain.sh -> libde265-1.0.5.tar.gz/ltmain.sh Changed

libde265-1.0.3.tar.gz/m4/libtool.m4 -> libde265-1.0.5.tar.gz/m4/libtool.m4 Changed

libde265-1.0.3.tar.gz/sherlock265/COPYING -> libde265-1.0.5.tar.gz/sherlock265/COPYING Changed

@@ -1,674 +1,20 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;

libde265-1.0.3.tar.gz/sherlock265/Makefile.in -> libde265-1.0.5.tar.gz/sherlock265/Makefile.in Changed

libde265-1.0.3.tar.gz/sherlock265/VideoDecoder.cc -> libde265-1.0.5.tar.gz/sherlock265/VideoDecoder.cc Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "sherlock265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of sherlock265, an example application using libde265.
- *
- * sherlock265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sherlock265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sherlock265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "sherlock265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #include "VideoDecoder.hh"
 #ifdef HAVE_VIDEOGFX
@@ -237,7 +243,7 @@
     }
     width = img->get_width();
     height = img->get_height();
-    sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+    sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
   }
 
   int stride[3];

libde265-1.0.3.tar.gz/sherlock265/VideoDecoder.hh -> libde265-1.0.5.tar.gz/sherlock265/VideoDecoder.hh Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "sherlock265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of sherlock265, an example application using libde265.
- *
- * sherlock265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sherlock265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sherlock265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "sherlock265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #ifndef VIDEODECODER_HH
 #define VIDEODECODER_HH

libde265-1.0.3.tar.gz/sherlock265/VideoPlayer.cc -> libde265-1.0.5.tar.gz/sherlock265/VideoPlayer.cc Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "sherlock265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of sherlock265, an example application using libde265.
- *
- * sherlock265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sherlock265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sherlock265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "sherlock265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #include "VideoPlayer.hh"

libde265-1.0.3.tar.gz/sherlock265/VideoPlayer.hh -> libde265-1.0.5.tar.gz/sherlock265/VideoPlayer.hh Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "sherlock265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of sherlock265, an example application using libde265.
- *
- * sherlock265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sherlock265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sherlock265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "sherlock265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #ifndef VIDEOPLAYER_HH
 #define VIDEOPLAYER_HH

libde265-1.0.3.tar.gz/sherlock265/VideoWidget.cc -> libde265-1.0.5.tar.gz/sherlock265/VideoWidget.cc Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "sherlock265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of sherlock265, an example application using libde265.
- *
- * sherlock265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sherlock265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sherlock265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "sherlock265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #include "VideoWidget.hh"
 #include <QtGui>

libde265-1.0.3.tar.gz/sherlock265/VideoWidget.hh -> libde265-1.0.5.tar.gz/sherlock265/VideoWidget.hh Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "sherlock265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of sherlock265, an example application using libde265.
- *
- * sherlock265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sherlock265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sherlock265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "sherlock265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #ifndef VIDEOWIDGET_HH
 #define VIDEOWIDGET_HH

libde265-1.0.3.tar.gz/sherlock265/sherlock265.cc -> libde265-1.0.5.tar.gz/sherlock265/sherlock265.cc Changed

@@ -1,22 +1,28 @@
 /*
- * libde265 example application "sherlock265".
- * Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
- *
- * This file is part of sherlock265, an example application using libde265.
- *
- * sherlock265 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sherlock265 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sherlock265.  If not, see <http://www.gnu.org/licenses/>.
- */
+  libde265 example application "sherlock265".
+
+  MIT License
+
+  Copyright (c) 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
 #include "VideoPlayer.hh"
 
@@ -37,4 +43,3 @@
 
   return app.exec();
 }
-

libde265-1.0.3.tar.gz/tools/Makefile.am -> libde265-1.0.5.tar.gz/tools/Makefile.am Changed

libde265-1.0.3.tar.gz/tools/Makefile.in -> libde265-1.0.5.tar.gz/tools/Makefile.in Changed

Changes of Revision 2