diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 19:31:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 19:31:08 +0200 |
| commit | 00d234688512c83f3e62b6781676469b78f4ab2b (patch) | |
| tree | 51dd1839347e11b44b9420dd23b629c99fa25ed7 /libavformat/swf.h | |
| parent | 0160fe454c38a507eaf53ec9012e07244597f672 (diff) | |
| parent | 15201e256035a3e8f9d3d7b96fc327467e1a8ead (diff) | |
| download | ffmpeg-00d234688512c83f3e62b6781676469b78f4ab2b.tar.gz | |
Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'
* commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead':
configure: check $as first before using $gas as GNU as
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swf.h')
0 files changed, 0 insertions, 0 deletions