[FFmpeg-devel] [PATCH] add hds demuxer

[Michael Niedermayer]

On Wed, Oct 12, 2016 at 03:56:49PM +0800, Steven Liu wrote:
> init add hds demuxer
> 
> Based-on: patch by CORY MCCARTHY <cory.mccarthy at shaw.ca>
> Based-on: patch by Gorilla Maguila <gorilla.maguila at gmail.com>
> Signed-off-by: Steven Liu <lq at chinaffmpeg.org>
> ---
>  configure                 |    5 +
>  libavformat/Makefile      |    1 +
>  libavformat/allformats.c  |    2 +-
>  libavformat/amfmetadata.c |  219 +++++++++++++
>  libavformat/amfmetadata.h |   39 +++
>  libavformat/f4fbox.c      |  381 +++++++++++++++++++++++
>  libavformat/f4fbox.h      |   95 ++++++
>  libavformat/f4mmanifest.c |  324 +++++++++++++++++++
>  libavformat/f4mmanifest.h |   59 ++++
>  libavformat/flvtag.c      |  370 ++++++++++++++++++++++
>  libavformat/flvtag.h      |   32 ++
>  libavformat/hdsdec.c      |  759 +++++++++++++++++++++++++++++++++++++++++++++
>  12 files changed, 2285 insertions(+), 1 deletions(-)
>  create mode 100644 libavformat/amfmetadata.c
>  create mode 100644 libavformat/amfmetadata.h
>  create mode 100644 libavformat/f4fbox.c
>  create mode 100644 libavformat/f4fbox.h
>  create mode 100644 libavformat/f4mmanifest.c
>  create mode 100644 libavformat/f4mmanifest.h
>  create mode 100644 libavformat/flvtag.c
>  create mode 100644 libavformat/flvtag.h
>  create mode 100644 libavformat/hdsdec.c
> 
> diff --git a/configure b/configure
> index 8fc71fb..d695e29 100755
> --- a/configure
> +++ b/configure
> @@ -295,6 +295,7 @@ External library support:
>                             on OSX if openssl and gnutls are not used [autodetect]
>    --enable-x11grab         enable X11 grabbing (legacy) [no]
>    --disable-xlib           disable xlib [autodetect]
> +  --disable-xml2           disable XML parsing using the C library libxml2 [autodetect]
>    --disable-zlib           disable zlib [autodetect]
>  
>    The following libraries provide various hardware acceleration features:
> @@ -1552,6 +1553,7 @@ EXTERNAL_LIBRARY_LIST="
>      videotoolbox
>      x11grab
>      xlib
> +    xml2
>      zlib
>  "
>  
> @@ -2854,6 +2856,7 @@ eac3_demuxer_select="ac3_parser"
>  f4v_muxer_select="mov_muxer"
>  fifo_muxer_deps="threads"
>  flac_demuxer_select="flac_parser"
> +hds_demuxer_select="xml2"
>  hds_muxer_select="flv_muxer"
>  hls_muxer_select="mpegts_muxer"
>  image2_alias_pix_demuxer_select="image2_demuxer"
> @@ -5627,6 +5630,8 @@ disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
>  disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
>  disabled  lzma || check_lib2  lzma.h lzma_version_number -llzma || disable lzma
>  
> +disabled xml2 || require_pkg_config libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion || disable xml2
> +
>  check_lib math.h sin -lm && LIBM="-lm"
>  disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd

this breaks build without libxml2

../configure --cc='ccache x86_64-w64-mingw32-gcc'   --arch=x86_64 --target-os=mingw32 --cross-prefix=x86_64-w64-mingw32-
ERROR: libxml-2.0 not found using pkg-config

it should be autodetected or disabled by default

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

What does censorship reveal? It reveals fear. -- Julian Assange
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20161012/4cdec755/attachment.sig>