ffmpeg/libavformat/hlsenc.c at 70a65ecabff00a8330a56ceb51b15d10cb5b5389

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00

Files

Michael Niedermayer aed58f6aae 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@gmx.at>

2013-01-09 11:26:31 +01:00

9.0 KiB

Raw Blame History

View Raw

9.0 KiB Raw Blame History

9.0 KiB

Raw Blame History