Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 18:35:43 +0000 (20:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 18:35:43 +0000 (20:35 +0200)
commit5a1aa559054b197b64453c60dd01bc5c37532ff9
tree0637dbfbde146258ebacdfa0b2c7aadbe24ec856
parent242f8bb3a8a11a54266f43ad45a5a4a260dcbe7f
parentb01a2204b5cff7bb920f42fda1bb0103f450fe93
Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'

* commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93':
  libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support

Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libfdk-aacdec.c
libavcodec/version.h