[FFmpeg-cvslog] Merge commit '18e6f087c4a50bede8449ee164778945480be50c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec  9 13:35:49 2012 +0100| [5de1f7a7bd8a69d1cbf4f31816f996c99d545a10] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5de1f7a7bd8a69d1cbf4f31816f996c99d545a10
---