Merge commit '18e6f087c4a50bede8449ee164778945480be50c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Dec 2012 12:35:49 +0000 (13:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Dec 2012 12:35:49 +0000 (13:35 +0100)
commit5de1f7a7bd8a69d1cbf4f31816f996c99d545a10
treeac4816768fb314f3dcd844592d2a544a3ad1348c
parent9f92e590ba91faa1283b1a9a35dd7e43c5bd998b
parent18e6f087c4a50bede8449ee164778945480be50c
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>
doc/muxers.texi
libavformat/hlsenc.c