Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Feb 2015 20:48:32 +0000 (21:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Feb 2015 21:02:41 +0000 (22:02 +0100)
commitd8901c2f018ec85e12bfd7d1a7d5dd76229db85e
tree695351df0fbfa77c386a8190382b9c78e9751d50
parent6998400c618fb267acb6b7281418f3b89fcabc8a
parentb339019de4e5f4d3c661bbdba98ae248ab77e2f0
Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'

* commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0':
  dca: Split code for handling the EXSS extension off into a separate file

Conflicts:
libavcodec/Makefile
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dca_exss.h
libavcodec/dcadec.c
libavcodec/dcaenc.c