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)
* qatar/master:
  intreadwrite: tomi: Add missing attributes.h #include for av_always_inline

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

Simple merge