Merge commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:43:31 +0000 (13:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:43:31 +0000 (13:43 +0200)
* commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb':
  hlsenc: Add a proper dependency on the mpegts muxer

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavformat/Makefile

diff --cc configure
+++ b/configure
@@@ -2038,16 -1806,12 +2038,17 @@@ avisynth_demuxer_deps="avisynth
  avisynth_demuxer_select="riffdec"
  caf_demuxer_select="riffdec"
  dirac_demuxer_select="dirac_parser"
 +dts_demuxer_select="dca_parser"
 +dtshd_demuxer_select="dca_parser"
  dxa_demuxer_select="riffdec"
  eac3_demuxer_select="ac3_parser"
 +f4v_muxer_select="mov_muxer"
  flac_demuxer_select="flac_parser"
+ hls_muxer_select="mpegts_muxer"
  ipod_muxer_select="mov_muxer"
  ismv_muxer_select="mov_muxer"
 +libnut_demuxer_deps="libnut"
 +libnut_muxer_deps="libnut"
  matroska_audio_muxer_select="matroska_muxer"
  matroska_demuxer_select="riffdec"
  matroska_demuxer_suggest="bzlib lzo zlib"
@@@ -167,11 -140,8 +167,11 @@@ OBJS-$(CONFIG_H263_MUXER
  OBJS-$(CONFIG_H264_DEMUXER)              += h264dec.o rawdec.o
  OBJS-$(CONFIG_H264_MUXER)                += rawenc.o
  OBJS-$(CONFIG_HLS_DEMUXER)               += hls.o
- OBJS-$(CONFIG_HLS_MUXER)                 += hlsenc.o mpegtsenc.o
+ OBJS-$(CONFIG_HLS_MUXER)                 += hlsenc.o
 +OBJS-$(CONFIG_ICO_DEMUXER)               += icodec.o
 +OBJS-$(CONFIG_ICO_MUXER)                 += icoenc.o
  OBJS-$(CONFIG_IDCIN_DEMUXER)             += idcin.o
 +OBJS-$(CONFIG_IDF_DEMUXER)               += bintext.o sauce.o
  OBJS-$(CONFIG_IFF_DEMUXER)               += iff.o
  OBJS-$(CONFIG_ILBC_DEMUXER)              += ilbc.o
  OBJS-$(CONFIG_ILBC_MUXER)                += ilbc.o