diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:02:26 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:02:35 +0100 |
| commit | 420806f0d14a8de81cfbd38032649c710eec7ac1 (patch) | |
| tree | 116cae0ee57540b6f48e89d143ca42f006761706 /libavcodec/jni.c | |
| parent | 7e3d3a6a895f80e8a376a3ba37054eb84b44f671 (diff) | |
| parent | b298b36fc008ad94a24929fe770c8189d96bcac4 (diff) | |
| download | ffmpeg-420806f0d14a8de81cfbd38032649c710eec7ac1.tar.gz | |
Merge commit 'b298b36fc008ad94a24929fe770c8189d96bcac4'
* commit 'b298b36fc008ad94a24929fe770c8189d96bcac4':
fate: Only run SRTP test if SRTP code is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/jni.c')
0 files changed, 0 insertions, 0 deletions