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

8.5 KiB

Raw Blame History

View Raw