Merge commit '803f8992f11d1eb301672cd13c685a7b1d04c467'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Sep 2014 17:18:08 +0000 (19:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Sep 2014 17:18:08 +0000 (19:18 +0200)
commit91a8b933fb6d9bf41f5885793bfcc0cb24de6100
tree7b8ba48cf2f3a22f4316acf2cf387ced43ec056f
parenta52e74db17e56a49464d36c9168f5fea5ce2be02
parent803f8992f11d1eb301672cd13c685a7b1d04c467
Merge commit '803f8992f11d1eb301672cd13c685a7b1d04c467'

* commit '803f8992f11d1eb301672cd13c685a7b1d04c467':
  build: cosmetics: Group hwaccel OBJS declarations together

Conflicts:
libavcodec/Makefile

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