diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 00:29:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 00:29:06 +0200 |
| commit | 9515d7c629cdd71c68bced05ea235aad08b768ce (patch) | |
| tree | c4e55aa824ab522a74ff7036bace4b7648e70fa1 /libavformat/cavsvideodec.c | |
| parent | 9eeedf87699837cd18df567a8d9d148009737b04 (diff) | |
| parent | 5be7d8597d02bcaba2de2503c0e59cf865c746dc (diff) | |
| download | ffmpeg-9515d7c629cdd71c68bced05ea235aad08b768ce.tar.gz | |
Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'
* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
fft-test: Comment some #endifs
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cavsvideodec.c')
0 files changed, 0 insertions, 0 deletions