[FFmpeg-cvslog] Merge commit '92e354b655613b88c3c202a7e19e7037daed37eb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  9 11:26:31 2013 +0100| [aed58f6aae0c00a0df5ef31ec3362f47ce773f62] | committer: Michael Niedermayer

Merge commit '92e354b655613b88c3c202a7e19e7037daed37eb'

* commit '92e354b655613b88c3c202a7e19e7037daed37eb':
  rtpdec_vp8: Set the timestamp when returning a deferred packet
  hlsenc: Make the start_number option set the right variable

Conflicts:
	libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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