casa-mp-base

Submitted By:            Armin K <krejzi au email do com>

Date:                    2016-05-06

Initial Package Version: 2.2.3

Upstream Status:         Committed

Origin:                  Upstream

Description:             Fixes building against ffmpeg3

                         Rediffed for version 2.2.3 by Bruce Dubbs

​

diff -Naur  configure  configure

---  configure  2016-04-04 19:45:51.000000000 -0500

+++  configure  2016-05-06 22:39:24.859030920 -0500

@@ -36549,7 +36549,7 @@

     if test -n "$PKG_CONFIG" && \

     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil < 55\""; } >&5

-  ($PKG_CONFIG --exists --print-errors "libavutil < 55") 2>&5

+  ($PKG_CONFIG --exists --print-errors "libavutil > 55") 2>&5

   ac_status=$?

   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

   test $ac_status = 0; }; then

@@ -36843,7 +36843,7 @@

     ffmpeg)

       if test -n "$PKG_CONFIG" && \

     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5

-  ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5

+  ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5

   ac_status=$?

   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

   test $ac_status = 0; }; then

@@ -36927,7 +36927,7 @@

       ffmpeg)

         if test -n "$PKG_CONFIG" && \

     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5

-  ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5

+  ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5

   ac_status=$?

   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

   test $ac_status = 0; }; then

@@ -45119,7 +45119,7 @@

     ffmpeg) av_vdpau_ver="55.42.100"

       if test -n "$PKG_CONFIG" && \

     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5

-  ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5

+  ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5

   ac_status=$?

   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

   test $ac_status = 0; }; then

diff -Naur  modules/codec/avcodec/audio.c  modules/codec/avcodec/audio.c

---  modules/codec/avcodec/audio.c  2015-12-08 10:18:56.000000000 -0600

+++  modules/codec/avcodec/audio.c  2016-05-06 22:39:24.859030920 -0500

@@ -36,12 +36,11 @@

 #include <vlc_codec.h>

 #include <vlc_avcodec.h>

+#include "avcodec.h"

+

 #include <libavcodec/avcodec.h>

 #include <libavutil/mem.h>

-#include <libavutil/audioconvert.h>

-

-#include "avcodec.h"