Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Mar 2015 20:44:06 +0000 (21:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Mar 2015 21:18:41 +0000 (22:18 +0100)
commit209001073adf190ccf2e578f25d4b3d41b1640a0
tree11d04d4bd1eb083cfe3019bddd5e99587026fef7
parente46a7fdc8748c286e391c1e7f2921d98a4486681
parent217e4ff4d1f845b76e44634e29371cd09313d1c2
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'

* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
  dca: Support for XLL (lossless extension)

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dca_xll.c
libavcodec/dcadata.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h