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 /libavformat | |
| parent | 271f4112670f2c6e43aa27d69bee3e057f34ddb9 (diff) | |
| parent | c9ad5f59aa84759a5f072842a93da2091febdb60 (diff) | |
| download | ffmpeg-streaming-f7b46d86dee8fe3c086ed541211a139952ed96f9.zip ffmpeg-streaming-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 'libavformat')
0 files changed, 0 insertions, 0 deletions
