* commit '92e354b6':
  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@gmx.at>