bump ffmpeg-git-25c81e4; adapt patch

diff --git a/archive-patches/ffmpeg/0001-ffmpeg-hds-libroxml-3.x.patch b/archive-patches/ffmpeg/0001-ffmpeg-hds-libroxml-3.x.patch
index 40ea9b6811fc020f48b8a56e00c4e222b197fb1d..e6b43586d76feb8b0da68dba0ca23edf6594471d 100644 (file)
--- a/archive-patches/ffmpeg/0001-ffmpeg-hds-libroxml-3.x.patch
+++ b/archive-patches/ffmpeg/0001-ffmpeg-hds-libroxml-3.x.patch
@@ -1,6 +1,6 @@
-From a6ceed822b71d46c30b0f70270b59b7afb0e5137 Mon Sep 17 00:00:00 2001
+From b780a5a06439ab0857ca5a87e691d66fdb218e7d Mon Sep 17 00:00:00 2001
 From: Markham <markham001@gmx.de>
-Date: Wed, 3 May 2017 17:51:31 +0200
+Date: Thu, 18 May 2017 17:56:29 +0200
 Subject: [PATCH] ffmpeg-hds-libroxml-3.x
 
 ---
@@ -30,7 +30,7 @@ Subject: [PATCH] ffmpeg-hds-libroxml-3.x
  create mode 100644 libavformat/hdsdec.c
 
 diff --git a/configure b/configure
-index c3fa9d8..1934364 100755
+index 18fbb73..c49aad4 100755
 --- a/configure
 +++ b/configure
 @@ -293,6 +293,7 @@ External library support:
@@ -41,15 +41,15 @@ index c3fa9d8..1934364 100755
  
    The following libraries provide various hardware acceleration features:
    --disable-audiotoolbox   disable Apple AudioToolbox code [autodetect]
-@@ -1555,6 +1556,7 @@ EXTERNAL_LIBRARY_LIST="
+@@ -1560,6 +1561,7 @@ EXTERNAL_LIBRARY_LIST="
      libopenmpt
      libopus
      libpulse
 +    libroxml
+     librsvg
      librtmp
      libschroedinger
-     libshine
-@@ -2921,6 +2923,7 @@ eac3_demuxer_select="ac3_parser"
+@@ -2933,6 +2935,7 @@ eac3_demuxer_select="ac3_parser"
  f4v_muxer_select="mov_muxer"
  fifo_muxer_deps="threads"
  flac_demuxer_select="flac_parser"
@@ -57,7 +57,7 @@ index c3fa9d8..1934364 100755
  hds_muxer_select="flv_muxer"
  hls_muxer_select="mpegts_muxer"
  image2_alias_pix_demuxer_select="image2_demuxer"
-@@ -5728,6 +5731,8 @@ disabled  zlib || check_lib zlib   zlib.h      zlibVersion    -lz
+@@ -5745,6 +5748,8 @@ disabled  zlib || check_lib zlib   zlib.h      zlibVersion    -lz
  disabled bzlib || check_lib bzlib bzlib.h BZ2_bzlibVersion    -lbz2
  disabled  lzma || check_lib lzma   lzma.h lzma_version_number -llzma
  
@@ -67,10 +67,10 @@ index c3fa9d8..1934364 100755
  disabled crystalhd || check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
  
 diff --git a/libavformat/Makefile b/libavformat/Makefile
-index d82639d..baf027e 100644
+index bfba0c1..33e38eb 100644
 --- a/libavformat/Makefile
 +++ b/libavformat/Makefile
-@@ -200,6 +200,7 @@ OBJS-$(CONFIG_H263_DEMUXER)              += h263dec.o rawdec.o
+@@ -199,6 +199,7 @@ OBJS-$(CONFIG_H263_DEMUXER)              += h263dec.o rawdec.o
  OBJS-$(CONFIG_H263_MUXER)                += rawenc.o
  OBJS-$(CONFIG_H264_DEMUXER)              += h264dec.o rawdec.o
  OBJS-$(CONFIG_H264_MUXER)                += rawenc.o
@@ -79,7 +79,7 @@ index d82639d..baf027e 100644
  OBJS-$(CONFIG_HDS_MUXER)                 += hdsenc.o
  OBJS-$(CONFIG_HEVC_DEMUXER)              += hevcdec.o rawdec.o
 diff --git a/libavformat/allformats.c b/libavformat/allformats.c
-index 09e62c3..8e99a3b 100644
+index 62661d1..3b4aa9d 100644
 --- a/libavformat/allformats.c
 +++ b/libavformat/allformats.c
 @@ -142,7 +142,7 @@ static void register_all(void)

diff --git a/make/versions.mk b/make/versions.mk
index 50f227b101aae784b9276a22b6c8edd16f1f2f90..3a403019316a7fc000a2dbff36dd678bc3871f36 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -42,7 +42,7 @@ E2FSPROGS_VER=1.42.13
 EXPAT_VER = 2.1.0
 
 # A complete, cross-platform solution to record, convert and stream audio and video
-FFMPEG_GIT = dec2fa8
+FFMPEG_GIT = 25c81e4
 
 # FLEX (the fast lexical analyser)
 FLEX_VER=2.5.35