patched ffmpeg nov 2

patches/to_upstream/05_respect_flac_dirac_configure.patch

Index: patches/to_upstream/05_respect_flac_dirac_configure.patch
===================================================================
--- patches/to_upstream/05_respect_flac_dirac_configure.patch	(revision 65184)
+++ patches/to_upstream/05_respect_flac_dirac_configure.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:32 -0700
-+++ ffmpeg-mt/libavcodec/Makefile	2010-10-11 16:54:34 -0700
+diff -wurp -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
+--- orig/libavcodec/Makefile	2010-11-04 08:06:22 -0700
++++ ffmpeg-mt/libavcodec/Makefile	2010-11-04 08:06:27 -0700
 @@ -522,8 +522,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER)          +
  OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.o mpeg4audio.o
@@ -11,10 +11,10 @@
  OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flacdec.o flacdata.o flac.o
  OBJS-$(CONFIG_RTP_MUXER)               += mpegvideo.o xiph.o
  OBJS-$(CONFIG_WEBM_MUXER)              += xiph.o mpeg4audio.o \
-diff -rpu -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile
---- orig/libavformat/Makefile	2010-10-11 16:54:33 -0700
-+++ ffmpeg-mt/libavformat/Makefile	2010-10-11 16:54:34 -0700
-@@ -153,12 +153,12 @@ OBJS-$(CONFIG_NULL_MUXER)               
+diff -wurp -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile
+--- orig/libavformat/Makefile	2010-11-04 08:06:24 -0700
++++ ffmpeg-mt/libavformat/Makefile	2010-11-04 08:06:27 -0700
+@@ -153,12 +153,12 @@ OBJS-$(CONFIG_NULL_MUXER)
  OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o nut.o riff.o
  OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o nut.o riff.o
  OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
@@ -30,9 +30,9 @@
                                              oggparsetheora.o \
                                              oggparsevorbis.o \
                                              riff.o \
-diff -rpu -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c
---- orig/libavformat/oggdec.c	2010-10-11 16:54:33 -0700
-+++ ffmpeg-mt/libavformat/oggdec.c	2010-10-11 16:54:34 -0700
+diff -wurp -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c
+--- orig/libavformat/oggdec.c	2010-11-04 08:06:24 -0700
++++ ffmpeg-mt/libavformat/oggdec.c	2010-11-04 08:06:27 -0700
 @@ -40,13 +40,23 @@
  
  static const struct ogg_codec * const ogg_codecs[] = {