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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: patches/to_upstream/05_respect_flac_dirac_configure.patch

Issue 4533003: patched ffmpeg nov 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« README.chromium ('K') | « 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff -rpu -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile 1 diff -wurp -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
2 --- orig/libavcodec/Makefile» 2010-10-11 16:54:32 -0700 2 --- orig/libavcodec/Makefile» 2010-11-04 08:06:22 -0700
3 +++ ffmpeg-mt/libavcodec/Makefile» 2010-10-11 16:54:34 -0700 3 +++ ffmpeg-mt/libavcodec/Makefile» 2010-11-04 08:06:27 -0700
4 @@ -522,8 +522,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) + 4 @@ -522,8 +522,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) +
5 OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o 5 OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o
6 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o 6 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o
7 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o 7 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o
8 -OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o \ 8 -OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o \
9 - dirac.o mpeg12data.o 9 - dirac.o mpeg12data.o
10 +OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o 10 +OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o
11 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o 11 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o
12 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o xiph.o 12 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o xiph.o
13 OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \ 13 OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \
14 diff -rpu -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile 14 diff -wurp -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile
15 --- orig/libavformat/Makefile» 2010-10-11 16:54:33 -0700 15 --- orig/libavformat/Makefile» 2010-11-04 08:06:24 -0700
16 +++ ffmpeg-mt/libavformat/Makefile» 2010-10-11 16:54:34 -0700 16 +++ ffmpeg-mt/libavformat/Makefile» 2010-11-04 08:06:27 -0700
17 @@ -153,12 +153,12 @@ OBJS-$(CONFIG_NULL_MUXER) 17 @@ -153,12 +153,12 @@ OBJS-$(CONFIG_NULL_MUXER)
18 OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.o 18 OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.o
19 OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o riff.o 19 OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o riff.o
20 OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o 20 OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o
21 +OBJS-$(CONFIG_FLAC_DECODER) += oggparseflac.o 21 +OBJS-$(CONFIG_FLAC_DECODER) += oggparseflac.o
22 +OBJS-$(CONFIG_DIRAC_DEMUXER) += oggparsedirac.o 22 +OBJS-$(CONFIG_DIRAC_DEMUXER) += oggparsedirac.o
23 +OBJS-$(CONFIG_LIBSPEEX) += oggparsespeex.o 23 +OBJS-$(CONFIG_LIBSPEEX) += oggparsespeex.o
24 OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ 24 OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \
25 - oggparsedirac.o \ 25 - oggparsedirac.o \
26 - oggparseflac.o \ 26 - oggparseflac.o \
27 oggparseogm.o \ 27 oggparseogm.o \
28 oggparseskeleton.o \ 28 oggparseskeleton.o \
29 - oggparsespeex.o \ 29 - oggparsespeex.o \
30 oggparsetheora.o \ 30 oggparsetheora.o \
31 oggparsevorbis.o \ 31 oggparsevorbis.o \
32 riff.o \ 32 riff.o \
33 diff -rpu -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c 33 diff -wurp -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c
34 --- orig/libavformat/oggdec.c» 2010-10-11 16:54:33 -0700 34 --- orig/libavformat/oggdec.c» 2010-11-04 08:06:24 -0700
35 +++ ffmpeg-mt/libavformat/oggdec.c» 2010-10-11 16:54:34 -0700 35 +++ ffmpeg-mt/libavformat/oggdec.c» 2010-11-04 08:06:27 -0700
36 @@ -40,13 +40,23 @@ 36 @@ -40,13 +40,23 @@
37 37
38 static const struct ogg_codec * const ogg_codecs[] = { 38 static const struct ogg_codec * const ogg_codecs[] = {
39 &ff_skeleton_codec, 39 &ff_skeleton_codec,
40 +#if CONFIG_DIRAC_DEMUXER 40 +#if CONFIG_DIRAC_DEMUXER
41 &ff_dirac_codec, 41 &ff_dirac_codec,
42 +#endif 42 +#endif
43 +#if CONFIG_LIBSPEEX 43 +#if CONFIG_LIBSPEEX
44 &ff_speex_codec, 44 &ff_speex_codec,
45 +#endif 45 +#endif
46 &ff_vorbis_codec, 46 &ff_vorbis_codec,
47 &ff_theora_codec, 47 &ff_theora_codec,
48 +#if CONFIG_FLAC_DECODER 48 +#if CONFIG_FLAC_DECODER
49 &ff_flac_codec, 49 &ff_flac_codec,
50 +#endif 50 +#endif
51 +#if CONFIG_DIRAC_DEMUXER 51 +#if CONFIG_DIRAC_DEMUXER
52 &ff_old_dirac_codec, 52 &ff_old_dirac_codec,
53 +#endif 53 +#endif
54 +#if CONFIG_FLAC_DECODER 54 +#if CONFIG_FLAC_DECODER
55 &ff_old_flac_codec, 55 &ff_old_flac_codec,
56 +#endif 56 +#endif
57 &ff_ogm_video_codec, 57 &ff_ogm_video_codec,
58 &ff_ogm_audio_codec, 58 &ff_ogm_audio_codec,
59 &ff_ogm_text_codec, 59 &ff_ogm_text_codec,
OLDNEW
« README.chromium ('K') | « 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 »

Powered by Google App Engine
This is Rietveld 408576698