diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 01:49:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 02:06:39 +0200 |
| commit | ac6b5bb834c0c3221fbdd1f74916d332157bfd39 (patch) | |
| tree | f6cab48a5f596f3fce5f6da3f1d2a608f98ac144 /libavcodec/fft.h | |
| parent | 26cd7b1e1ad54dca688b5d62081cd79c4f56a387 (diff) | |
| parent | 6cfbe1de5ac6c57c41459626f7ac32841d63ace8 (diff) | |
| download | ffmpeg-ac6b5bb834c0c3221fbdd1f74916d332157bfd39.tar.gz | |
Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'
* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8':
avconv: Use only audio and video to guess discontinuities
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft.h')
0 files changed, 0 insertions, 0 deletions