Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 11:04:45 +0000 (12:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 11:04:50 +0000 (12:04 +0100)
commitf7b46d86dee8fe3c086ed541211a139952ed96f9
tree6aeef5706fe8cabc83321ddb9c41aaa28e421866
parent271f4112670f2c6e43aa27d69bee3e057f34ddb9
parentc9ad5f59aa84759a5f072842a93da2091febdb60
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  intreadwrite: tomi: Add missing attributes.h #include for av_always_inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/tomi/intreadwrite.h