Merge commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 19:10:51 +0000 (20:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 19:10:51 +0000 (20:10 +0100)
commit68014c6ed98b5c90f4dc211429dd269ac727be4b
treefb2cfa04c693bf20d69e065955937347f7a5de93
parent57e939d963800f8e6977d0238e6116c7d1b53315
parentc3a0b3eb64be441ca897629e8ecd80d5b51fded7
Merge commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7'

* commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7':
  arm: build: Maintain decoder objects separate from infrastructure objects

Conflicts:
libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/Makefile