diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 20:40:41 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 20:40:41 +0200 |
commit | 09f5b3750f2d8164497ff4bdca74d01c9b25a361 (patch) | |
tree | 4a09e4a840a96eaf2f5330ca26caced3d0442773 /libavfilter/src_movie.c | |
parent | 97d2b8d6f5a4b75ad80a265c30604870ebb97470 (diff) | |
parent | d445c865f87e7f13230e4dac3f77f5af21da95cb (diff) | |
download | ffmpeg-09f5b3750f2d8164497ff4bdca74d01c9b25a361.tar.gz |
Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'
* commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb':
fft-test: Reduce variable scope where sensibly possible
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/src_movie.c')
0 files changed, 0 insertions, 0 deletions