Michael Niedermayer 554a1ecab7 Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c' ...

* commit '7266e24f176389d2e81bfc7c829934f7c8ae361c':
  hls: Sync the file number with the start sequence

Conflicts:
	libavformat/hlsenc.c

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

2014-04-30 21:29:04 +02:00

9.8 KiB

Raw Blame History

View Raw