Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 18:25:12 +0000 (20:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 18:25:12 +0000 (20:25 +0200)
commit3bb22973518cbef28504e4d5b9fd74453cc3339c
tree06b64db5ed44740f1969da46db6dee79aa8d7bec
parentc1df467d73ee8c6e792ec27c126c5f0e2bc1af9d
parentefd26bedec9a345a5960dbfcbaec888418f2d4e6
Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'

* commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6':
  build: Add explanatory comments to (optimization) blocks in the Makefiles

Conflicts:
libavcodec/ppc/Makefile
libavcodec/x86/Makefile

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