diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:37:54 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:37:54 +0100 |
commit | 9b36f446acbfa8322185b7af673f7a40a6d9095f (patch) | |
tree | d651e1980d308bc58d41a48ea982cb31fcd54f2f /libswresample/audioconvert.h | |
parent | b0c75963c87defa2c31661af23860854dfe15b4c (diff) | |
parent | 30e9ef21cea09fa5e880e979c9f5b39edccbb6f4 (diff) | |
download | ffmpeg-9b36f446acbfa8322185b7af673f7a40a6d9095f.tar.gz |
Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'
* commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4':
timefilter-test: Only compile timefilter-test if JACK is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libswresample/audioconvert.h')
0 files changed, 0 insertions, 0 deletions