| OLD | NEW |
| 1 Index: patched-ffmpeg-mt/configure | 1 diff -rpu unpatched-ffmpeg-mt/configure ffmpeg-mt/configure |
| 2 =================================================================== | 2 --- unpatched-ffmpeg-mt/configure 2010-03-09 09:38:31 -0800 |
| 3 --- patched-ffmpeg-mt/configure (revision 39317) | 3 +++ ffmpeg-mt/configure 2010-03-11 16:50:15 -0800 |
| 4 +++ patched-ffmpeg-mt/configure (working copy) | 4 @@ -1711,7 +1711,7 @@ if $cc -v 2>&1 | grep -qi ^gcc; then |
| 5 @@ -1664,7 +1664,7 @@ | |
| 6 CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' | 5 CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' |
| 7 AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' | 6 AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' |
| 8 fi | 7 fi |
| 9 - speed_cflags='-O3' | 8 - speed_cflags='-O3' |
| 10 + speed_cflags='-O2' | 9 + speed_cflags='-O2' |
| 11 size_cflags='-Os' | 10 size_cflags='-Os' |
| 12 elif $cc --version 2>/dev/null | grep -q Intel; then | 11 elif $cc --version 2>/dev/null | grep -q Intel; then |
| 13 cc_type=icc | 12 cc_type=icc |
| 14 @@ -2500,6 +2500,9 @@ | 13 @@ -2555,6 +2555,9 @@ if enabled pthreads; then |
| 15 add_extralibs -pthreads | 14 add_extralibs -pthreads |
| 16 elif check_func pthread_create -lpthreadGC2; then | 15 elif check_func pthread_create -lpthreadGC2; then |
| 17 add_extralibs -lpthreadGC2 | 16 add_extralibs -lpthreadGC2 |
| 18 + elif check_func pthread_create -lpthreadGC2 -lws2_32; then | 17 + elif check_func pthread_create -lpthreadGC2 -lws2_32; then |
| 19 + add_cflags -DPTW32_STATIC_LIB | 18 + add_cflags -DPTW32_STATIC_LIB |
| 20 + add_extralibs -lpthreadGC2 -lws2_32 | 19 + add_extralibs -lpthreadGC2 -lws2_32 |
| 21 elif ! check_lib pthread.h pthread_create -lpthread; then | 20 elif ! check_lib pthread.h pthread_create -lpthread; then |
| 22 die "ERROR: can't find pthreads library" | 21 die "ERROR: can't find pthreads library" |
| 23 fi | 22 fi |
| 24 Index: patched-ffmpeg-mt/libavcodec/allcodecs.c | 23 Only in ffmpeg-mt: configure~ |
| 25 =================================================================== | 24 diff -rpu unpatched-ffmpeg-mt/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcod
ecs.c |
| 26 --- patched-ffmpeg-mt/libavcodec/allcodecs.c (revision 39317) | 25 --- unpatched-ffmpeg-mt/libavcodec/allcodecs.c 2010-03-09 09:38:32 -0800 |
| 27 +++ patched-ffmpeg-mt/libavcodec/allcodecs.c (working copy) | 26 +++ ffmpeg-mt/libavcodec/allcodecs.c 2010-03-11 16:50:15 -0800 |
| 28 @@ -45,6 +45,14 @@ | 27 @@ -45,6 +45,14 @@ |
| 29 extern AVBitStreamFilter x##_bsf; \ | 28 extern AVBitStreamFilter x##_bsf; \ |
| 30 if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); } | 29 if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); } |
| 31 | 30 |
| 32 +#ifdef PTW32_STATIC_LIB | 31 +#ifdef PTW32_STATIC_LIB |
| 33 +static void detach_ptw32(void) | 32 +static void detach_ptw32(void) |
| 34 +{ | 33 +{ |
| 35 + pthread_win32_thread_detach_np(); | 34 + pthread_win32_thread_detach_np(); |
| 36 + pthread_win32_process_detach_np(); | 35 + pthread_win32_process_detach_np(); |
| 37 +} | 36 +} |
| 38 +#endif | 37 +#endif |
| 39 + | 38 + |
| 40 void avcodec_register_all(void) | 39 void avcodec_register_all(void) |
| 41 { | 40 { |
| 42 static int initialized; | 41 static int initialized; |
| 43 @@ -53,6 +61,11 @@ | 42 @@ -53,6 +61,11 @@ void avcodec_register_all(void) |
| 44 return; | 43 return; |
| 45 initialized = 1; | 44 initialized = 1; |
| 46 | 45 |
| 47 +#ifdef PTW32_STATIC_LIB | 46 +#ifdef PTW32_STATIC_LIB |
| 48 + pthread_win32_process_attach_np(); | 47 + pthread_win32_process_attach_np(); |
| 49 + pthread_win32_thread_attach_np(); | 48 + pthread_win32_thread_attach_np(); |
| 50 + atexit(detach_ptw32); | 49 + atexit(detach_ptw32); |
| 51 +#endif | 50 +#endif |
| 52 /* hardware accelerators */ | 51 /* hardware accelerators */ |
| 53 REGISTER_HWACCEL (H263_VAAPI, h263_vaapi); | 52 REGISTER_HWACCEL (H263_VAAPI, h263_vaapi); |
| 54 REGISTER_HWACCEL (H264_DXVA2, h264_dxva2); | 53 REGISTER_HWACCEL (H264_DXVA2, h264_dxva2); |
| 55 | 54 |
| OLD | NEW |