diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:26:52 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:26:52 +0100 |
commit | 0abd926d64a75c78e89bfc40c5398bcf45b6824b (patch) | |
tree | cbd3aaa44aa43d9ca183fc23f72a8b26210553f5 /libavcodec/jpegls.h | |
parent | 61b5dee49e74c400647951d1b0c26bb88116efb5 (diff) | |
parent | 450b02307cb631f501793b52b98b610c3a54378b (diff) | |
download | ffmpeg-0abd926d64a75c78e89bfc40c5398bcf45b6824b.tar.gz |
Merge commit '450b02307cb631f501793b52b98b610c3a54378b' into release/2.4
* commit '450b02307cb631f501793b52b98b610c3a54378b':
arm: Suppress tags about used cpu arch and extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpegls.h')
0 files changed, 0 insertions, 0 deletions