diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-07 05:41:01 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-07 06:01:43 +0400 |
| commit | 13b7781ec8d475513c1ee40a6e481763b728a71e (patch) | |
| tree | 953bee0a6461e74085e45e1f7793de6f850534e5 /libavformat/network.c | |
| parent | ada8d485c0f77a4e79fac7f3f96031c4d0e6bc7a (diff) | |
| parent | f2bd8a0786ded12c70d6877f16944b44ea731462 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
x86inc: use sse versions of common macros instead of sse2 when applicable
doc/APIchanges: add missing dates and hashes
lavf: don't return from void av_update_cur_dts()
Changelog: add more entries.
Changelog: update ffmpeg/avconv incompatibility list.
avconv: remove some redundant temporary variables.
avconv: fix broken indentation
avconv: move copy_initial_nonkeyframes to the options context.
avconv: use file:stream instead of file.stream in log messages.
doc/avconv: elaborate on basic functionality.
doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
Call avformat_network_init/deinit in the programs
Remove leftover includes of strings.h
avutil: Don't allow using strcasecmp/strncasecmp
Replace all usage of strcasecmp/strncasecmp
avstring: Add locale independent implementations of strcasecmp/strncasecmp
avstring: Add locale independent implementations of toupper/tolower
cosmetics: insert some spaces in explicit enum value assignments
move 8SVX audio codecs to the audio codec list part on the next bump
...
Conflicts:
avprobe.c
doc/APIchanges
ffplay.c
ffserver.c
libavcodec/avcodec.h
libavdevice/bktr.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavformat/matroskaenc.c
libavformat/wtv.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/avutil.h
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.c')
| -rw-r--r-- | libavformat/network.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/network.c b/libavformat/network.c index 33435cf524..e5482a1475 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -46,7 +46,7 @@ static void openssl_lock(int mode, int type, const char *file, int line) else pthread_mutex_unlock(&openssl_mutexes[type]); } -#ifndef WIN32 +#if !defined(WIN32) && OPENSSL_VERSION_NUMBER < 0x10000000 static unsigned long openssl_thread_id(void) { return (intptr_t) pthread_self(); @@ -79,7 +79,7 @@ void ff_tls_init(void) for (i = 0; i < CRYPTO_num_locks(); i++) pthread_mutex_init(&openssl_mutexes[i], NULL); CRYPTO_set_locking_callback(openssl_lock); -#ifndef WIN32 +#if !defined(WIN32) && OPENSSL_VERSION_NUMBER < 0x10000000 CRYPTO_set_id_callback(openssl_thread_id); #endif } |