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

Side by Side Diff: static_pthread_O2.patch

Issue 164120: Add patches for block-level quant in theora, -O2 on build, and statically link pthread on Windows (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 11 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
« no previous file with comments | « r19356_theora_decode_init_error_passing.patch ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Name: svn:eol-style
+ LF
OLDNEW
(Empty)
1 diff -ur ffmpeg-mt.orig/configure ffmpeg-mt/configure
2 --- ffmpeg-mt.orig/configure 2009-05-08 04:41:29.000000000 +0000
3 +++ ffmpeg-mt/configure 2009-08-07 21:16:34.000000000 +0000
4 @@ -1216,7 +1216,7 @@
5 SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
6 LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
7
8 -host_cflags='-O3 -g -Wall'
9 +host_cflags='-O2 -g -Wall'
10 host_libs='-lm'
11
12 target_path='.'
13 @@ -2013,6 +2013,9 @@
14 add_extralibs -pthreads
15 elif check_func pthread_create -lpthreadGC2; then
16 add_extralibs -lpthreadGC2
17 + elif check_func pthread_create -lpthreadGC2 -lws2_32; then
18 + add_cflags -DPTW32_STATIC_LIB
19 + add_extralibs -lpthreadGC2 -lws2_32
20 elif ! check_lib pthread.h pthread_create -lpthread; then
21 die "ERROR: can't find pthreads library"
22 fi
23 @@ -2202,7 +2205,7 @@
24 elif enabled ccc; then
25 add_cflags -fast
26 else
27 - add_cflags -O3
28 + add_cflags -O2
29 fi
30 fi
31 check_cflags -fno-math-errno
32 diff -ur ffmpeg-mt.orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
33 --- ffmpeg-mt.orig/libavcodec/allcodecs.c 2009-05-07 21:41:29.000000000 -0 700
34 +++ ffmpeg-mt/libavcodec/allcodecs.c 2009-08-07 10:51:13.226355400 -0700
35 @@ -45,6 +45,14 @@
36 extern AVBitStreamFilter x##_bsf; \
37 if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); }
38
39 +#ifdef PTW32_STATIC_LIB
40 +static void detach_ptw32(void)
41 +{
42 + pthread_win32_thread_detach_np();
43 + pthread_win32_process_detach_np();
44 +}
45 +#endif
46 +
47 void avcodec_register_all(void)
48 {
49 static int initialized;
50 @@ -53,6 +61,11 @@
51 return;
52 initialized = 1;
53
54 +#ifdef PTW32_STATIC_LIB
55 + pthread_win32_process_attach_np();
56 + pthread_win32_thread_attach_np();
57 + atexit(detach_ptw32);
58 +#endif
59 /* hardware accelerators */
60 REGISTER_HWACCEL (H263_VAAPI, h263_vaapi);
61 REGISTER_HWACCEL (MPEG2_VAAPI, mpeg2_vaapi);
OLDNEW
« no previous file with comments | « r19356_theora_decode_init_error_passing.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698