diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-27 22:17:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-27 22:17:17 +0200 |
| commit | fbf9583f9f88b24e0cb7c35b253193ae8f35e93d (patch) | |
| tree | 1f2f4e523c4c8c89ee7d9299c297a9bd43ec7b92 /libavfilter/af_amerge.c | |
| parent | 4a006b9eb7e7d736fd00e6045b5612978ef6404b (diff) | |
| parent | d8ffb2055f0e0fcb5d025bab72eb19c2a886c125 (diff) | |
| download | ffmpeg-fbf9583f9f88b24e0cb7c35b253193ae8f35e93d.tar.gz | |
Merge commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125'
* commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125':
lavf: split tls.c
Conflicts:
libavformat/tls.c
libavformat/tls_gnutls.c
libavformat/tls_openssl.c
See: 4a006b9eb7e7d736fd00e6045b5612978ef6404b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions