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

Unified Diff: patches/to_upstream/05_respect_flac_dirac_configure.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/05_respect_flac_dirac_configure.patch
===================================================================
--- patches/to_upstream/05_respect_flac_dirac_configure.patch (revision 53990)
+++ 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-07-19 12:51:30.889579500 -0700
-+++ ffmpeg-mt/libavcodec/Makefile 2010-07-19 12:51:33.666379500 -0700
+--- orig/libavcodec/Makefile 2010-07-27 13:07:39.604735200 -0700
++++ ffmpeg-mt/libavcodec/Makefile 2010-07-27 13:07:41.410915800 -0700
@@ -515,8 +515,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) +
OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o
OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o
@@ -12,8 +12,8 @@
OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o
OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \
diff -rpu -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile
---- orig/libavformat/Makefile 2010-07-19 12:51:31.841179500 -0700
-+++ ffmpeg-mt/libavformat/Makefile 2010-07-19 12:51:33.681979500 -0700
+--- orig/libavformat/Makefile 2010-07-27 13:07:40.198794600 -0700
++++ ffmpeg-mt/libavformat/Makefile 2010-07-27 13:07:41.414916200 -0700
@@ -146,12 +146,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
@@ -31,8 +31,8 @@
oggparsevorbis.o \
riff.o \
diff -rpu -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c
---- orig/libavformat/oggdec.c 2010-07-19 12:51:31.887979500 -0700
-+++ ffmpeg-mt/libavformat/oggdec.c 2010-07-19 12:51:33.681979500 -0700
+--- orig/libavformat/oggdec.c 2010-07-27 13:07:40.334808200 -0700
++++ ffmpeg-mt/libavformat/oggdec.c 2010-07-27 13:07:41.417916500 -0700
@@ -40,13 +40,23 @@
static const struct ogg_codec * const ogg_codecs[] = {
Property changes on: patches\to_upstream\05_respect_flac_dirac_configure.patch
___________________________________________________________________
Added: svn:eol-style
+ LF

Powered by Google App Engine
This is Rietveld 408576698