patches/to_upstream/05_respect_flac_dirac_configure.patch - Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: patches/to_upstream/05_respect_flac_dirac_configure.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/05_respect_flac_dirac_configure.patch

===================================================================

--- patches/to_upstream/05_respect_flac_dirac_configure.patch (revision 50820)

+++ patches/to_upstream/05_respect_flac_dirac_configure.patch (working copy)

@@ -1,7 +1,7 @@

diff -rpu -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile

---- orig/libavcodec/Makefile 2010-06-17 09:45:25.394070600 -0700

-+++ ffmpeg-mt/libavcodec/Makefile 2010-06-17 09:45:27.545285700 -0700

-@@ -509,8 +509,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) +

+--- orig/libavcodec/Makefile 2010-06-24 19:19:28.449283400 -0700

++++ ffmpeg-mt/libavcodec/Makefile 2010-06-24 19:19:31.085717200 -0700

+@@ -510,8 +510,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) +

OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o

OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o

OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.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-06-17 09:45:26.494180600 -0700

-+++ ffmpeg-mt/libavformat/Makefile 2010-06-17 09:45:27.549286100 -0700

+--- orig/libavformat/Makefile 2010-06-24 19:19:29.291694200 -0700

++++ ffmpeg-mt/libavformat/Makefile 2010-06-24 19:19:31.085717200 -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-06-17 09:45:26.535184700 -0700

-+++ ffmpeg-mt/libavformat/oggdec.c 2010-06-17 09:45:27.552286400 -0700

+--- orig/libavformat/oggdec.c 2010-06-24 19:19:29.416495800 -0700

++++ ffmpeg-mt/libavformat/oggdec.c 2010-06-24 19:19:31.085717200 -0700

@@ -40,13 +40,23 @@

static const struct ogg_codec * const ogg_codecs[] = {

« no previous file with comments | « patches/to_upstream/04_vc1_bsfs.patch ('k') | patches/to_upstream/06_remove_decode_on_config_no_svq3.patch » ('j') | no next file with comments »