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

Unified Diff: patches/to_upstream/04_vc1_bsfs.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, 5 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/04_vc1_bsfs.patch
===================================================================
--- patches/to_upstream/04_vc1_bsfs.patch (revision 53990)
+++ patches/to_upstream/04_vc1_bsfs.patch (working copy)
@@ -1,6 +1,6 @@
diff -rpu -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
---- orig/libavcodec/Makefile 2010-07-19 12:50:40.610779500 -0700
-+++ ffmpeg-mt/libavcodec/Makefile 2010-07-19 12:50:43.637179500 -0700
+--- orig/libavcodec/Makefile 2010-07-27 13:07:28.079582800 -0700
++++ ffmpeg-mt/libavcodec/Makefile 2010-07-27 13:07:29.930767900 -0700
@@ -609,6 +609,9 @@ OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)
OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o
OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o
@@ -12,8 +12,8 @@
# thread libraries
OBJS-$(HAVE_PTHREADS) += pthread.o
diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
---- orig/libavcodec/allcodecs.c 2010-07-19 12:50:40.205179500 -0700
-+++ ffmpeg-mt/libavcodec/allcodecs.c 2010-07-19 12:50:43.637179500 -0700
+--- orig/libavcodec/allcodecs.c 2010-07-27 13:07:27.334508300 -0700
++++ ffmpeg-mt/libavcodec/allcodecs.c 2010-07-27 13:07:29.935768400 -0700
@@ -406,5 +406,7 @@ void avcodec_register_all(void)
REGISTER_BSF (NOISE, noise);
REGISTER_BSF (REMOVE_EXTRADATA, remove_extradata);
@@ -24,7 +24,7 @@
diff -rpu -N orig/libavcodec/vc1_asftoannexg_bsf.c ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c
--- orig/libavcodec/vc1_asftoannexg_bsf.c 1969-12-31 16:00:00.000000000 -0800
-+++ ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c 2010-07-19 12:50:43.652779500 -0700
++++ ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c 2010-07-27 13:07:29.944769300 -0700
@@ -0,0 +1,182 @@
+/*
+ * copyright (c) 2010 Google Inc.
@@ -210,7 +210,7 @@
+};
diff -rpu -N orig/libavcodec/vc1_asftorcv_bsf.c ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c
--- orig/libavcodec/vc1_asftorcv_bsf.c 1969-12-31 16:00:00.000000000 -0800
-+++ ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c 2010-07-19 12:50:43.652779500 -0700
++++ ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c 2010-07-27 13:07:29.950769900 -0700
@@ -0,0 +1,88 @@
+/*
+ * copyright (c) 2010 Google Inc.
Property changes on: patches\to_upstream\04_vc1_bsfs.patch
___________________________________________________________________
Added: svn:eol-style
+ LF

Powered by Google App Engine
This is Rietveld 408576698