Hendrik Leppkes 1907e19d0c Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33' ...

* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33':
  movenc: Add a new flag for writing global sidx indexes for dash

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

2015-08-18 08:50:22 +02:00

6.6 KiB

Raw Blame History

View Raw