Merge branch 'master' of https://github.com/strukturag/libde265

Author: farindk

.travis.yml

@@ -53,6 +53,8 @@ before_script:
 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 ./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 ./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 ./dec265/.libs/dec265 -q -c -f 100 ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi"

CMakeLists.txt

@@ -33,6 +33,9 @@ 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")
+  add_definitions(-Wall)
+  set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
 endif()
 
 option(DISABLE_SSE "Disable SSE optimizations")

libde265/Makefile.am

@@ -22,60 +22,74 @@ libde265_la_LDFLAGS = -version-info $(LIBDE265_CURRENT):$(LIBDE265_REVISION):$(L
 libde265_la_LIBADD = -lstdc++
 
 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 \
-  nal-parser.cc \
-  nal-parser.h \
+  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 \
-  intrapred.cc \
-  md5.cc \
-  nal.cc \
-  pps.cc \
-  transform.cc \
-  refpic.cc \
-  sao.cc \
-  scan.cc \
-  sei.cc \
-  slice.cc \
-  sps.cc \
-  util.cc \
-  vps.cc \
-  bitstream.h \
-  cabac.h \
-  deblock.h \
-  decctx.h \
   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 \
-  transform.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.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.cc \
+  vui.h
 
 SUBDIRS = encoder
 libde265_la_LIBADD += encoder/libde265_encoder.la