diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:44:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:44:40 +0100 |
| commit | dec5586bc7340e4aeca86f22c64846767814a8f2 (patch) | |
| tree | 1c060dc6d8555a3630826bcf69a14bc7d1694896 /libavformat/utils.c | |
| parent | c5587516ca9155d575b9dd584ea746ebc2e333bd (diff) | |
| parent | 9841654c158c80e9d525ba03754135d3f34e306e (diff) | |
| download | ffmpeg-dec5586bc7340e4aeca86f22c64846767814a8f2.tar.gz | |
Merge commit '9841654c158c80e9d525ba03754135d3f34e306e' into release/1.1
* commit '9841654c158c80e9d525ba03754135d3f34e306e':
arm: Suppress tags about used cpu arch and extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions