diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:48:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:48:18 +0100 |
| commit | bec350611eb1a7a5f7db402e8e86e8e0f985c0d8 (patch) | |
| tree | 4c879fa0db4526a0025acf9e8bae1b01b6d23ce9 /libavfilter/af_resample.c | |
| parent | 895ddf1a80f28a3d81b016e4bc8bd10b519d4f26 (diff) | |
| parent | 7fd11fbeeb41990427b475dc0d8800d2cf15a8c4 (diff) | |
| download | ffmpeg-bec350611eb1a7a5f7db402e8e86e8e0f985c0d8.tar.gz | |
Merge commit '7fd11fbeeb41990427b475dc0d8800d2cf15a8c4' into release/2.2
* commit '7fd11fbeeb41990427b475dc0d8800d2cf15a8c4':
arm: Suppress tags about used cpu arch and extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_resample.c')
0 files changed, 0 insertions, 0 deletions