Compile fixes for stretch

diff --git a/GNUmakefile b/GNUmakefile
index 55d7829900836f8208094cd0b67adc49ea04bd70..0682e5d9cc26bc496391f3f3c8fef10e5feb11cc 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -35,8 +35,8 @@ LD=arm-linux-gnueabi-g++-4.7
 endif
 
 
-CXXFLAGS_DEV = -g -O0 -Wall -Wshadow -DDEV -D_GNU_SOURCE $(INCLUDES) $(vomp_options)
-CXXFLAGS_REL = -O3 -Wall -Wshadow  -D_GNU_SOURCE $(INCLUDES) $(vomp_options)
+CXXFLAGS_DEV = -g -O0 -Wall -Wshadow -Wno-psabi -DDEV -D_GNU_SOURCE $(INCLUDES) $(vomp_options)
+CXXFLAGS_REL = -O3 -Wall -Wshadow -Wno-psabi -D_GNU_SOURCE $(INCLUDES) $(vomp_options)
 LIBPATHS =
 
 

diff --git a/audioomx.cc b/audioomx.cc
index 048ffb0b579a7e3680beba6e3ffca30858e2ae91..e7980e22ddad5589163497b23280284f39e7feb9 100644 (file)
--- a/audioomx.cc
+++ b/audioomx.cc
@@ -820,7 +820,12 @@ int AudioOMX::InitDecoderLibAV()
        }
 
        ac3codec_context_libav->flags |= CODEC_FLAG_TRUNCATED;
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 64, 101)
+       ac3codec_context_libav->request_channel_layout=2;
+#else
        ac3codec_context_libav->request_channels=2;
+#endif
 
        int avc_ret = avcodec_open2(ac3codec_context_libav, ac3codec_libav, NULL);
        if (avc_ret < 0) {
@@ -836,7 +841,11 @@ int AudioOMX::InitDecoderLibAV()
        }
 
        aaclatmcodec_context_libav->flags |= CODEC_FLAG_TRUNCATED;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 64, 101)
+       aaclatmcodec_context_libav->request_channel_layout=2;
+#else
        aaclatmcodec_context_libav->request_channels=2;
+#endif
 
        avc_ret = avcodec_open2(aaclatmcodec_context_libav, aaclatmcodec_libav, NULL);
        if (avc_ret < 0) {
@@ -854,7 +863,11 @@ int AudioOMX::InitDecoderLibAV()
        }
 
        mp23codec_context_libav->flags |= CODEC_FLAG_TRUNCATED;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 64, 101)
+       mp23codec_context_libav->request_channel_layout=2;
+#else
        mp23codec_context_libav->request_channels=2;
+#endif
 
        avc_ret = avcodec_open2(mp23codec_context_libav, mp23codec_libav, NULL);
        if (avc_ret < 0) {
@@ -881,7 +894,11 @@ int AudioOMX::InitDecoderLibAV()
 
 
         av_init_packet(&incoming_paket_libav);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 64, 101)
+        decode_frame_libav=av_frame_alloc();
+#else
         decode_frame_libav=avcodec_alloc_frame();
+#endif
         libav_mutex.Unlock();
         decompress_buffer_filled=0;