Michael Niedermayer
5de1f7a7bd
Merge commit '18e6f087c4a50bede8449ee164778945480be50c'
...
* commit '18e6f087c4a50bede8449ee164778945480be50c':
img2: document the options available
hls: improve options description
hls: use a meaningful long name
hls: add start_number option
h264: check for invalid zeros_left before writing
Conflicts:
doc/demuxers.texi
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-09 13:35:49 +01:00
Luca Barbato
adbe03077d
hls: use a meaningful long name
2012-12-08 17:04:22 +01:00
Luca Barbato
5fbceb2c63
hls: add start_number option
2012-12-08 17:04:22 +01:00
Michael Niedermayer
e13d5e9a4b
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
...
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
x86: h264_weight_10bit: port to cpuflags
libtheoraenc: add missing pixdesc.h header
avcodec: remove ff_is_hwaccel_pix_fmt
pixdesc: add av_pix_fmt_get_chroma_sub_sample
hlsenc: stand alone hls segmenter
Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 11:59:20 +01:00
Luca Barbato
22a0827dff
hlsenc: stand alone hls segmenter
...
Simplifies usage but has higher latency.
2012-11-13 01:37:05 +01:00
