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

Conflicts:
	libavformat/Makefile
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>