[FFmpeg-cvslog] Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'

Michael Niedermayer git at videolan.org
Thu Feb 19 21:53:21 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 19 21:44:58 2015 +0100| [e821910a21510c2423c345b615602b42af26a70a] | committer: Michael Niedermayer

Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'

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

Conflicts:
	libavformat/Makefile
	libavformat/version.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e821910a21510c2423c345b615602b42af26a70a
---





More information about the ffmpeg-cvslog mailing list