diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 02:35:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 02:35:39 +0200 |
| commit | 71f33051e5d012ccf24d447ba7c01a867f8e77c1 (patch) | |
| tree | 25b96b42c0a4aa63d2530750673ea471e683f227 /libavfilter/avf_showcqt.c | |
| parent | 4213fc5b9eebec53c7d22b770c3f1ceecca1c113 (diff) | |
| parent | d9432789bd119f0e37bcf65cebda05d36aafd4ed (diff) | |
| download | ffmpeg-71f33051e5d012ccf24d447ba7c01a867f8e77c1.tar.gz | |
Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'
* commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed':
movenc: remove pointless loop around BITEXACT test
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avf_showcqt.c')
0 files changed, 0 insertions, 0 deletions