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

Unified Diff: patches/to_upstream/04_vc1_bsfs.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 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 50820)
+++ 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-06-17 09:45:05.049036300 -0700
-+++ ffmpeg-mt/libavcodec/Makefile 2010-06-17 09:45:06.985229900 -0700
+--- orig/libavcodec/Makefile 2010-06-24 19:19:20.508781600 -0700
++++ ffmpeg-mt/libavcodec/Makefile 2010-06-24 19:19:23.987626200 -0700
@@ -603,6 +603,9 @@ OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)
OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o
OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o
@@ -12,9 +12,9 @@
# thread libraries
OBJS-$(HAVE_BEOSTHREADS) += beosthread.o
diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
---- orig/libavcodec/allcodecs.c 2010-06-17 09:45:03.192850700 -0700
-+++ ffmpeg-mt/libavcodec/allcodecs.c 2010-06-17 09:45:06.990230400 -0700
-@@ -390,5 +390,7 @@ void avcodec_register_all(void)
+--- orig/libavcodec/allcodecs.c 2010-06-24 19:19:20.071976000 -0700
++++ ffmpeg-mt/libavcodec/allcodecs.c 2010-06-24 19:19:23.987626200 -0700
+@@ -403,5 +403,7 @@ void avcodec_register_all(void)
REGISTER_BSF (NOISE, noise);
REGISTER_BSF (REMOVE_EXTRADATA, remove_extradata);
REGISTER_BSF (TEXT2MOVSUB, text2movsub);
@@ -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-06-17 09:45:07.001231500 -0700
++++ ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c 2010-06-24 19:19:24.003226400 -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-06-17 09:45:06.995230900 -0700
++++ ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c 2010-06-24 19:19:24.003226400 -0700
@@ -0,0 +1,88 @@
+/*
+ * copyright (c) 2010 Google Inc.

Powered by Google App Engine
This is Rietveld 408576698