diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 12:04:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 12:04:50 +0100 |
| commit | f7b46d86dee8fe3c086ed541211a139952ed96f9 (patch) | |
| tree | 6aeef5706fe8cabc83321ddb9c41aaa28e421866 /libavutil | |
| parent | 271f4112670f2c6e43aa27d69bee3e057f34ddb9 (diff) | |
| parent | c9ad5f59aa84759a5f072842a93da2091febdb60 (diff) | |
| download | ffmpeg-f7b46d86dee8fe3c086ed541211a139952ed96f9.tar.gz | |
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>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/tomi/intreadwrite.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/tomi/intreadwrite.h b/libavutil/tomi/intreadwrite.h index 778b804ca1..7dec4158d3 100644 --- a/libavutil/tomi/intreadwrite.h +++ b/libavutil/tomi/intreadwrite.h @@ -22,7 +22,9 @@ #define AVUTIL_TOMI_INTREADWRITE_H #include <stdint.h> + #include "config.h" +#include "libavutil/attributes.h" #define AV_RB16 AV_RB16 static av_always_inline uint16_t AV_RB16(const void *p) |