Merge commit '57cde2b180fcec0eaf60aad65f436ab6420546f5'

Browse Source

* commit '57cde2b180fcec0eaf60aad65f436ab6420546f5':
  lavf: move TLS-related ifdeffery to library specific files

Conflicts:
	libavformat/network.c
	libavformat/tls.h
	libavformat/tls_openssl.c

See: a9f1d584e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2015-05-27 22:37:05 +02:00

parent a9f1d584e5 57cde2b180

commit eff2ed2fde

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available