| OLD | NEW |
|---|
| (Empty) | |
| 1 diff -wurp -N orig/libavcodec/Makefile ffmpeg/libavcodec/Makefile |
| 2 --- orig/libavcodec/Makefile 2011-07-12 20:47:24.792991744 -0700 |
| 3 +++ ffmpeg/libavcodec/Makefile 2011-07-12 20:47:24.882984792 -0700 |
| 4 @@ -556,8 +556,7 @@ OBJS-$(CONFIG_MOV_MUXER) + |
| 5 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o |
| 6 OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpeg4audio.o mpegaudiodata.o |
| 7 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o |
| 8 -OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o \ |
| 9 - dirac.o mpeg12data.o vorbis_data.o |
| 10 +OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o vorbis_data.o |
| 11 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o \ |
| 12 vorbis_data.o |
| 13 OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o mpegvideo.o xiph.o |
| 14 diff -wurp -N orig/libavformat/Makefile ffmpeg/libavformat/Makefile |
| 15 --- orig/libavformat/Makefile 2011-07-12 20:47:24.824391331 -0700 |
| 16 +++ ffmpeg/libavformat/Makefile 2011-07-12 20:47:24.882984792 -0700 |
| 17 @@ -163,13 +163,13 @@ OBJS-$(CONFIG_NULL_MUXER) |
| 18 OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.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 |
| 21 +OBJS-$(CONFIG_FLAC_DECODER) += oggparseflac.o |
| 22 +OBJS-$(CONFIG_DIRAC_DEMUXER) += oggparsedirac.o |
| 23 +OBJS-$(CONFIG_LIBSPEEX) += oggparsespeex.o |
| 24 OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ |
| 25 oggparsecelt.o \ |
| 26 - oggparsedirac.o \ |
| 27 - oggparseflac.o \ |
| 28 oggparseogm.o \ |
| 29 oggparseskeleton.o \ |
| 30 - oggparsespeex.o \ |
| 31 oggparsetheora.o \ |
| 32 oggparsevorbis.o \ |
| 33 riff.o \ |
| 34 diff -wurp -N orig/libavformat/oggdec.c ffmpeg/libavformat/oggdec.c |
| 35 --- orig/libavformat/oggdec.c 2011-07-12 20:47:24.824391331 -0700 |
| 36 +++ ffmpeg/libavformat/oggdec.c 2011-07-12 20:47:24.882984792 -0700 |
| 37 @@ -40,14 +40,24 @@ |
| 38 |
| 39 static const struct ogg_codec * const ogg_codecs[] = { |
| 40 &ff_skeleton_codec, |
| 41 +#if CONFIG_DIRAC_DEMUXER |
| 42 &ff_dirac_codec, |
| 43 +#endif |
| 44 +#if CONFIG_LIBSPEEX |
| 45 &ff_speex_codec, |
| 46 +#endif |
| 47 &ff_vorbis_codec, |
| 48 &ff_theora_codec, |
| 49 +#if CONFIG_FLAC_DECODER |
| 50 &ff_flac_codec, |
| 51 +#endif |
| 52 &ff_celt_codec, |
| 53 +#if CONFIG_DIRAC_DEMUXER |
| 54 &ff_old_dirac_codec, |
| 55 +#endif |
| 56 +#if CONFIG_FLAC_DECODER |
| 57 &ff_old_flac_codec, |
| 58 +#endif |
| 59 &ff_ogm_video_codec, |
| 60 &ff_ogm_audio_codec, |
| 61 &ff_ogm_text_codec, |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 9290059:
Initial commit of all previous Chrome build scripts. (Closed)
Base URL: http://git.chromium.org/chromium/third_party/ffmpeg.git@master