Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Feb 2014 21:02:19 +0000 (22:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Feb 2014 21:02:23 +0000 (22:02 +0100)
commitc4c5351f0857c80a7882143378cfb3db474146e8
tree27079d0a957b4d55638a795a7a3f86fca616a260
parent1524b0fa68e0ebe94959eb4554301053f62f87ef
parenta63ac1106d2e50589abeaeb09a2e78767f3d9fcf
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*

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