patched ffmpeg nov 2

patches/to_upstream/15_webp_ffmpeg.patch

Index: patches/to_upstream/15_webp_ffmpeg.patch
===================================================================
--- patches/to_upstream/15_webp_ffmpeg.patch	(revision 65184)
+++ patches/to_upstream/15_webp_ffmpeg.patch	(working copy)
@@ -1,7 +1,7 @@
-diff -rpu -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile
---- orig/libavformat/Makefile	2010-10-21 12:02:06 -0700
-+++ ffmpeg-mt/libavformat/Makefile	2010-10-21 12:03:27 -0700
-@@ -283,6 +283,8 @@ OBJS-$(CONFIG_WC3_DEMUXER)              
+diff -wurp -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile
+--- orig/libavformat/Makefile	2010-11-04 08:10:25 -0700
++++ ffmpeg-mt/libavformat/Makefile	2010-11-04 08:10:29 -0700
+@@ -284,6 +284,8 @@ OBJS-$(CONFIG_WC3_DEMUXER)
  OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \
                                              riff.o isom.o avc.o \
                                              flacenc_header.o
@@ -10,9 +10,9 @@
  OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
  OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o
  OBJS-$(CONFIG_WV_DEMUXER)                += wv.o apetag.o
-diff -rpu -N orig/libavformat/Makefile~ ffmpeg-mt/libavformat/Makefile~
+diff -wurp -N orig/libavformat/Makefile~ ffmpeg-mt/libavformat/Makefile~
 --- orig/libavformat/Makefile~	1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/Makefile~	2010-10-21 11:59:57 -0700
++++ ffmpeg-mt/libavformat/Makefile~	2010-11-04 08:10:29 -0700
 @@ -0,0 +1,327 @@
 +include $(SUBDIR)../config.mak
 +
@@ -341,9 +341,9 @@
 +include $(SUBDIR)../subdir.mak
 +
 +$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
-diff -rpu -N orig/libavformat/allformats.c ffmpeg-mt/libavformat/allformats.c
---- orig/libavformat/allformats.c	2010-10-21 12:02:05 -0700
-+++ ffmpeg-mt/libavformat/allformats.c	2010-10-21 12:03:27 -0700
+diff -wurp -N orig/libavformat/allformats.c ffmpeg-mt/libavformat/allformats.c
+--- orig/libavformat/allformats.c	2010-11-04 08:10:25 -0700
++++ ffmpeg-mt/libavformat/allformats.c	2010-11-04 08:10:29 -0700
 @@ -215,6 +215,7 @@ void av_register_all(void)
      REGISTER_MUXDEMUX (WAV, wav);
      REGISTER_DEMUXER  (WC3, wc3);
@@ -352,9 +352,9 @@
      REGISTER_DEMUXER  (WSAUD, wsaud);
      REGISTER_DEMUXER  (WSVQA, wsvqa);
      REGISTER_DEMUXER  (WV, wv);
-diff -rpu -N orig/libavformat/webp.c ffmpeg-mt/libavformat/webp.c
+diff -wurp -N orig/libavformat/webp.c ffmpeg-mt/libavformat/webp.c
 --- orig/libavformat/webp.c	1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/webp.c	2010-10-21 12:03:27 -0700
++++ ffmpeg-mt/libavformat/webp.c	2010-11-04 08:10:29 -0700
 @@ -0,0 +1,34 @@
 +/*
 + * Copyright (c) 2010, Google, Inc.
@@ -390,9 +390,9 @@
 +    { "ICMT", "comment" },
 +    { 0 }
 +};
-diff -rpu -N orig/libavformat/webp.h ffmpeg-mt/libavformat/webp.h
+diff -wurp -N orig/libavformat/webp.h ffmpeg-mt/libavformat/webp.h
 --- orig/libavformat/webp.h	1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/webp.h	2010-10-21 12:03:27 -0700
++++ ffmpeg-mt/libavformat/webp.h	2010-11-04 08:10:29 -0700
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2010, Google, Inc.
@@ -429,9 +429,9 @@
 +extern const AVMetadataConv ff_webp_metadata_conv[];
 +
 +#endif /* AVFORMAT_WEBP_H */
-diff -rpu -N orig/libavformat/webpdec.c ffmpeg-mt/libavformat/webpdec.c
+diff -wurp -N orig/libavformat/webpdec.c ffmpeg-mt/libavformat/webpdec.c
 --- orig/libavformat/webpdec.c	1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/webpdec.c	2010-10-21 12:03:27 -0700
++++ ffmpeg-mt/libavformat/webpdec.c	2010-11-04 08:10:29 -0700
 @@ -0,0 +1,132 @@
 +/*
 + * Copyright (c) 2010, Google, Inc.
@@ -565,9 +565,9 @@
 +    .value          = CODEC_ID_VP8,
 +    .codec_tag      = (const AVCodecTag*[]){webp_codec_tags, 0},
 +};
-diff -rpu -N orig/libavformat/webpenc.c ffmpeg-mt/libavformat/webpenc.c
+diff -wurp -N orig/libavformat/webpenc.c ffmpeg-mt/libavformat/webpenc.c
 --- orig/libavformat/webpenc.c	1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/webpenc.c	2010-10-21 12:03:27 -0700
++++ ffmpeg-mt/libavformat/webpenc.c	2010-11-04 08:10:29 -0700
 @@ -0,0 +1,123 @@
 +/*
 + * Copyright (c) 2010, Google, Inc.