Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 21:21:08 +0000 (22:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 21:26:31 +0000 (22:26 +0100)
commit011d83de488d2051c485a1618dda0a43d77bcbc7
treedbde540836a29c1effe020f0a92c1c5978cd3c8d
parent3775224b2f8a9c2c0bf5d53272236d4a1ffb0875
parent0e083d7e43805db1a978cb57bfa25fda62e8ff18
Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'

* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18':
  build: Group general components separate from de/encoders in arch Makefiles

Conflicts:
libavcodec/arm/Makefile
libavcodec/x86/Makefile

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