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

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

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 6 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 | « libswscale.tar.gz ('k') | patches/to_upstream/02_mov_dref_looping.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff -rpu -N orig/configure ffmpeg-mt/configure 1 diff -rpu -N orig/configure ffmpeg-mt/configure
2 --- orig/configure» 2010-06-17 14:24:32.715784100 -0700 2 --- orig/configure» 2010-06-24 19:18:57.311284200 -0700
3 +++ ffmpeg-mt/configure»2010-06-17 14:24:35.505063000 -0700 3 +++ ffmpeg-mt/configure»2010-06-24 19:19:02.022544600 -0700
4 @@ -1724,7 +1724,7 @@ if $cc -v 2>&1 | grep -qi ^gcc; then 4 @@ -1727,7 +1727,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 @@ -2551,6 +2551,9 @@ if enabled pthreads; then 13 @@ -2537,6 +2537,9 @@ if enabled pthreads; then
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 die "ERROR: can't find pthreads library" 21 die "ERROR: can't find pthreads library"
22 fi 22 fi
23 @@ -2754,7 +2757,7 @@ elif enabled ccc; then 23 @@ -2748,7 +2751,7 @@ 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 26 check_cflags -Werror=implicit
27 - check_cflags -Werror=missing-prototypes 27 - check_cflags -Werror=missing-prototypes
28 +# check_cflags -Werror=missing-prototypes 28 +# check_cflags -Werror=missing-prototypes
29 elif enabled clang; then 29 elif enabled clang; then
30 check_cflags -Qunused-arguments 30 check_cflags -Qunused-arguments
31 elif enabled armcc; then 31 elif enabled armcc; then
32 diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c 32 diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
33 --- orig/libavcodec/allcodecs.c»2010-06-17 14:24:32.839796500 -0700 33 --- orig/libavcodec/allcodecs.c»2010-06-24 19:18:57.451686000 -0700
34 +++ ffmpeg-mt/libavcodec/allcodecs.c» 2010-06-17 14:24:35.508063300 -0700 34 +++ ffmpeg-mt/libavcodec/allcodecs.c» 2010-06-24 19:19:02.038144800 -0700
35 @@ -45,6 +45,14 @@ 35 @@ -45,6 +45,14 @@
36 extern AVBitStreamFilter x##_bsf; \ 36 extern AVBitStreamFilter x##_bsf; \
37 if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); } 37 if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); }
38 38
39 +#ifdef PTW32_STATIC_LIB 39 +#ifdef PTW32_STATIC_LIB
40 +static void detach_ptw32(void) 40 +static void detach_ptw32(void)
41 +{ 41 +{
42 + pthread_win32_thread_detach_np(); 42 + pthread_win32_thread_detach_np();
43 + pthread_win32_process_detach_np(); 43 + pthread_win32_process_detach_np();
44 +} 44 +}
45 +#endif 45 +#endif
46 + 46 +
47 void avcodec_register_all(void) 47 void avcodec_register_all(void)
48 { 48 {
49 static int initialized; 49 static int initialized;
50 @@ -53,6 +61,11 @@ void avcodec_register_all(void) 50 @@ -53,6 +61,11 @@ void avcodec_register_all(void)
51 return; 51 return;
52 initialized = 1; 52 initialized = 1;
53 53
54 +#ifdef PTW32_STATIC_LIB 54 +#ifdef PTW32_STATIC_LIB
55 + pthread_win32_process_attach_np(); 55 + pthread_win32_process_attach_np();
56 + pthread_win32_thread_attach_np(); 56 + pthread_win32_thread_attach_np();
57 + atexit(detach_ptw32); 57 + atexit(detach_ptw32);
58 +#endif 58 +#endif
59 /* hardware accelerators */ 59 /* hardware accelerators */
60 REGISTER_HWACCEL (H263_VAAPI, h263_vaapi); 60 REGISTER_HWACCEL (H263_VAAPI, h263_vaapi);
61 REGISTER_HWACCEL (H264_DXVA2, h264_dxva2); 61 REGISTER_HWACCEL (H264_DXVA2, h264_dxva2);
OLDNEW
« no previous file with comments | « libswscale.tar.gz ('k') | patches/to_upstream/02_mov_dref_looping.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698