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

Unified Diff: patches/to_upstream/01_static_pthread_O2.patch

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: patches/to_upstream/01_static_pthread_O2.patch
===================================================================
--- patches/to_upstream/01_static_pthread_O2.patch (revision 41313)
+++ patches/to_upstream/01_static_pthread_O2.patch (working copy)
@@ -1,8 +1,7 @@
-Index: patched-ffmpeg-mt/configure
-===================================================================
---- patched-ffmpeg-mt/configure (revision 39317)
-+++ patched-ffmpeg-mt/configure (working copy)
-@@ -1664,7 +1664,7 @@
+diff -rpu unpatched-ffmpeg-mt/configure ffmpeg-mt/configure
+--- unpatched-ffmpeg-mt/configure 2010-03-09 09:38:31 -0800
++++ ffmpeg-mt/configure 2010-03-11 16:50:15 -0800
+@@ -1711,7 +1711,7 @@ if $cc -v 2>&1 | grep -qi ^gcc; then
CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
fi
@@ -11,7 +10,7 @@
size_cflags='-Os'
elif $cc --version 2>/dev/null | grep -q Intel; then
cc_type=icc
-@@ -2500,6 +2500,9 @@
+@@ -2555,6 +2555,9 @@ if enabled pthreads; then
add_extralibs -pthreads
elif check_func pthread_create -lpthreadGC2; then
add_extralibs -lpthreadGC2
@@ -21,10 +20,10 @@
elif ! check_lib pthread.h pthread_create -lpthread; then
die "ERROR: can't find pthreads library"
fi
-Index: patched-ffmpeg-mt/libavcodec/allcodecs.c
-===================================================================
---- patched-ffmpeg-mt/libavcodec/allcodecs.c (revision 39317)
-+++ patched-ffmpeg-mt/libavcodec/allcodecs.c (working copy)
+Only in ffmpeg-mt: configure~
+diff -rpu unpatched-ffmpeg-mt/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
+--- unpatched-ffmpeg-mt/libavcodec/allcodecs.c 2010-03-09 09:38:32 -0800
++++ ffmpeg-mt/libavcodec/allcodecs.c 2010-03-11 16:50:15 -0800
@@ -45,6 +45,14 @@
extern AVBitStreamFilter x##_bsf; \
if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); }
@@ -40,7 +39,7 @@
void avcodec_register_all(void)
{
static int initialized;
-@@ -53,6 +61,11 @@
+@@ -53,6 +61,11 @@ void avcodec_register_all(void)
return;
initialized = 1;

Powered by Google App Engine
This is Rietveld 408576698