Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:44:58 +0000 (21:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:44:58 +0000 (21:44 +0100)
commite821910a21510c2423c345b615602b42af26a70a
tree3ab3c71873b2077a21007c26d94ce38400b1d372
parentdfe5a9f022b38ba292212ce2daff60221e411e10
parent062cd5a975ff7bd6fb91f9b4d1d9d102a7545499
Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'

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

Conflicts:
libavformat/Makefile
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavformat/Makefile
libavformat/allformats.c
libavformat/dss.c
libavformat/version.h