Michael Niedermayer e821910a21 Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499' ...

* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
  lavf: Add DSS demuxer

Conflicts:
	libavformat/Makefile
	libavformat/version.h

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

2015-02-19 21:44:58 +01:00

18 KiB

Raw Blame History

View Raw