Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:31:26 +0000 (21:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:31:26 +0000 (21:31 +0100)
commitdfe5a9f022b38ba292212ce2daff60221e411e10
treeb641963626d99ac6db929e48367b67f9d8140df6
parent99bcfe62278ffc11e2665e653dcb90336ec8d7ff
parentc56b9b1eb278c5ef89d3f0832a56dfe4732cb68b
Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'

* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
  lavc: Add DSS SP decoder

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/dss_sp.c
libavcodec/version.h