Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: patches/to_upstream/01_static_pthread_O2.patch

Issue 3066011: ffmpeg configured with webm decode only to avoid postproc that pulls in unuse... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 diff -rpu -N orig/configure ffmpeg-mt/configure 1 diff -rpu -N orig/configure ffmpeg-mt/configure
2 --- orig/configure» 2010-07-19 13:35:49.151379500 -0700 2 --- orig/configure» 2010-07-27 13:05:17.865562700 -0700
3 +++ ffmpeg-mt/configure»2010-07-19 13:35:56.717379500 -0700 3 +++ ffmpeg-mt/configure»2010-07-27 13:05:29.670743100 -0700
4 @@ -1788,7 +1788,7 @@ if $cc -v 2>&1 | grep -qi ^gcc; then 4 @@ -1788,7 +1788,7 @@ if $cc -v 2>&1 | grep -qi ^gcc; then
5 CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' 5 CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
6 AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' 6 AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
7 fi 7 fi
8 - speed_cflags='-O3' 8 - speed_cflags='-O3'
9 + speed_cflags='-O2' 9 + speed_cflags='-O2'
10 size_cflags='-Os' 10 size_cflags='-Os'
11 elif $cc --version 2>/dev/null | grep -q Intel; then 11 elif $cc --version 2>/dev/null | grep -q Intel; then
12 cc_type=icc 12 cc_type=icc
13 @@ -2607,6 +2607,9 @@ if ! disabled pthreads && ! enabled w32t 13 @@ -2607,6 +2607,9 @@ if ! disabled pthreads && ! enabled w32t
14 add_extralibs -pthreads 14 add_extralibs -pthreads
15 elif check_func pthread_create -lpthreadGC2; then 15 elif check_func pthread_create -lpthreadGC2; then
16 add_extralibs -lpthreadGC2 16 add_extralibs -lpthreadGC2
17 + elif check_func pthread_create -lpthreadGC2 -lws2_32; then 17 + elif check_func pthread_create -lpthreadGC2 -lws2_32; then
18 + add_cflags -DPTW32_STATIC_LIB 18 + add_cflags -DPTW32_STATIC_LIB
19 + add_extralibs -lpthreadGC2 -lws2_32 19 + add_extralibs -lpthreadGC2 -lws2_32
20 elif ! check_lib pthread.h pthread_create -lpthread; then 20 elif ! check_lib pthread.h pthread_create -lpthread; then
21 disable pthreads 21 disable pthreads
22 fi 22 fi
23 @@ -2823,7 +2826,6 @@ elif enabled ccc; then 23 @@ -2823,7 +2826,6 @@ elif enabled ccc; then
24 elif enabled gcc; then 24 elif enabled gcc; then
25 check_cflags -fno-tree-vectorize 25 check_cflags -fno-tree-vectorize
26 check_cflags -Werror=implicit-function-declaration 26 check_cflags -Werror=implicit-function-declaration
27 - check_cflags -Werror=missing-prototypes 27 - check_cflags -Werror=missing-prototypes
28 elif enabled clang; then 28 elif enabled clang; then
29 check_cflags -Qunused-arguments 29 check_cflags -Qunused-arguments
30 elif enabled armcc; then 30 elif enabled armcc; then
31 diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c 31 diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
32 --- orig/libavcodec/allcodecs.c»2010-07-19 13:35:49.541379500 -0700 32 --- orig/libavcodec/allcodecs.c»2010-07-27 13:05:18.281604300 -0700
33 +++ ffmpeg-mt/libavcodec/allcodecs.c» 2010-07-19 13:35:56.732979500 -0700 33 +++ ffmpeg-mt/libavcodec/allcodecs.c» 2010-07-27 13:05:29.675743600 -0700
34 @@ -45,6 +45,14 @@ 34 @@ -45,6 +45,14 @@
35 extern AVBitStreamFilter x##_bsf; \ 35 extern AVBitStreamFilter x##_bsf; \
36 if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); } 36 if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); }
37 37
38 +#ifdef PTW32_STATIC_LIB 38 +#ifdef PTW32_STATIC_LIB
39 +static void detach_ptw32(void) 39 +static void detach_ptw32(void)
40 +{ 40 +{
41 + pthread_win32_thread_detach_np(); 41 + pthread_win32_thread_detach_np();
42 + pthread_win32_process_detach_np(); 42 + pthread_win32_process_detach_np();
43 +} 43 +}
44 +#endif 44 +#endif
45 + 45 +
46 void avcodec_register_all(void) 46 void avcodec_register_all(void)
47 { 47 {
48 static int initialized; 48 static int initialized;
49 @@ -53,6 +61,11 @@ void avcodec_register_all(void) 49 @@ -53,6 +61,11 @@ void avcodec_register_all(void)
50 return; 50 return;
51 initialized = 1; 51 initialized = 1;
52 52
53 +#ifdef PTW32_STATIC_LIB 53 +#ifdef PTW32_STATIC_LIB
54 + pthread_win32_process_attach_np(); 54 + pthread_win32_process_attach_np();
55 + pthread_win32_thread_attach_np(); 55 + pthread_win32_thread_attach_np();
56 + atexit(detach_ptw32); 56 + atexit(detach_ptw32);
57 +#endif 57 +#endif
58 /* hardware accelerators */ 58 /* hardware accelerators */
59 REGISTER_HWACCEL (H263_VAAPI, h263_vaapi); 59 REGISTER_HWACCEL (H263_VAAPI, h263_vaapi);
60 REGISTER_HWACCEL (H264_DXVA2, h264_dxva2); 60 REGISTER_HWACCEL (H264_DXVA2, h264_dxva2);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698