patched ffmpeg nov 2

patches/to_upstream/04_vc1_bsfs.patch

Index: patches/to_upstream/04_vc1_bsfs.patch
===================================================================
--- patches/to_upstream/04_vc1_bsfs.patch	(revision 65184)
+++ 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-10-11 16:54:23 -0700
-+++ ffmpeg-mt/libavcodec/Makefile	2010-10-11 16:54:26 -0700
+diff -wurp -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
+--- orig/libavcodec/Makefile	2010-11-04 08:05:59 -0700
++++ ffmpeg-mt/libavcodec/Makefile	2010-11-04 08:06:04 -0700
 @@ -617,6 +617,9 @@ OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)
  OBJS-$(CONFIG_NOISE_BSF)                  += noise_bsf.o
  OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)       += remove_extradata_bsf.o
@@ -11,9 +11,9 @@
  
  # thread libraries
  OBJS-$(HAVE_PTHREADS)                  += pthread.o
-diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
---- orig/libavcodec/allcodecs.c	2010-10-11 16:54:23 -0700
-+++ ffmpeg-mt/libavcodec/allcodecs.c	2010-10-11 16:54:26 -0700
+diff -wurp -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
+--- orig/libavcodec/allcodecs.c	2010-11-04 08:05:58 -0700
++++ ffmpeg-mt/libavcodec/allcodecs.c	2010-11-04 08:06:04 -0700
 @@ -413,5 +413,7 @@ void avcodec_register_all(void)
      REGISTER_BSF     (NOISE, noise);
      REGISTER_BSF     (REMOVE_EXTRADATA, remove_extradata);
@@ -22,9 +22,9 @@
 +    REGISTER_BSF     (VC1_ASFTOANNEXG, vc1_asftoannexg);
  }
  
-diff -rpu -N orig/libavcodec/vc1_asftoannexg_bsf.c ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c
+diff -wurp -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 -0800
-+++ ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c	2010-10-11 16:54:26 -0700
++++ ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c	2010-11-04 08:06:04 -0700
 @@ -0,0 +1,182 @@
 +/*
 + * copyright (c) 2010 Google Inc.
@@ -208,9 +208,9 @@
 +    asftoannexg_filter,
 +    asftoannexg_close,
 +};
-diff -rpu -N orig/libavcodec/vc1_asftorcv_bsf.c ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c
+diff -wurp -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 -0800
-+++ ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c	2010-10-11 16:54:26 -0700
++++ ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c	2010-11-04 08:06:04 -0700
 @@ -0,0 +1,88 @@
 +/*
 + * copyright (c) 2010 Google Inc.