Chromium Code Reviews Chromium Code Reviews
Issue 9317107:
FFmpeg merge diff after patches. (Closed)
Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master| OLD | NEW |
|---|---|
| 1 include $(SUBDIR)../config.mak | 1 include $(SUBDIR)../config.mak |
| 2 | 2 |
| 3 NAME = avcodec | 3 NAME = avcodec |
| 4 FFLIBS = avutil | 4 FFLIBS = avutil |
| 5 | 5 |
| 6 HEADERS = avcodec.h avfft.h dxva2.h vaapi.h vda.h vdpau.h version.h xvmc.h | 6 HEADERS = avcodec.h avfft.h dxva2.h vaapi.h vda.h vdpau.h version.h xvmc.h |
| 7 | 7 |
| 8 OBJS = allcodecs.o \ | 8 OBJS = allcodecs.o \ |
| 9 audioconvert.o \ | 9 audioconvert.o \ |
| 10 avpacket.o \ | 10 avpacket.o \ |
| (...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 594 OBJS-$(CONFIG_MATROSKA_MUXER) += xiph.o mpeg4audio.o \ | 594 OBJS-$(CONFIG_MATROSKA_MUXER) += xiph.o mpeg4audio.o \ |
| 595 flacdec.o flacdata.o flac.o \ | 595 flacdec.o flacdata.o flac.o \ |
| 596 mpegaudiodata.o vorbis_data.o | 596 mpegaudiodata.o vorbis_data.o |
| 597 OBJS-$(CONFIG_MP3_MUXER) += mpegaudiodata.o mpegaudiodecheader.o | 597 OBJS-$(CONFIG_MP3_MUXER) += mpegaudiodata.o mpegaudiodecheader.o |
| 598 OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o timecode. o | 598 OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o timecode. o |
| 599 OBJS-$(CONFIG_MOV_MUXER) += mpeg4audio.o mpegaudiodata.o | 599 OBJS-$(CONFIG_MOV_MUXER) += mpeg4audio.o mpegaudiodata.o |
| 600 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o | 600 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o |
| 601 OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpeg4audio.o mpegaudiodata.o | 601 OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpeg4audio.o mpegaudiodata.o |
| 602 OBJS-$(CONFIG_MXF_MUXER) += timecode.o | 602 OBJS-$(CONFIG_MXF_MUXER) += timecode.o |
| 603 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o | 603 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o |
| 604 OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o \ | 604 OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o vorbis_data.o |
|
scherkus (not reviewing)
2012/02/06 17:46:29
is this our patch?
DaleCurtis
2012/02/06 18:59:01
Yup, 05_respect_flag_dirac_configure.patch
| |
| 605 dirac.o mpeg12data.o vorbis_data.o | |
| 606 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o \ | 605 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o \ |
| 607 vorbis_data.o | 606 vorbis_data.o |
| 608 OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o mpegvideo.o xiph.o | 607 OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o mpegvideo.o xiph.o |
| 609 OBJS-$(CONFIG_SPDIF_DEMUXER) += aacadtsdec.o mpeg4audio.o | 608 OBJS-$(CONFIG_SPDIF_DEMUXER) += aacadtsdec.o mpeg4audio.o |
| 610 OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \ | 609 OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \ |
| 611 flacdec.o flacdata.o flac.o \ | 610 flacdec.o flacdata.o flac.o \ |
| 612 mpegaudiodata.o vorbis_data.o | 611 mpegaudiodata.o vorbis_data.o |
| 613 OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o | 612 OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o |
| 614 | 613 |
| 615 # external codec libraries | 614 # external codec libraries |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 783 $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h | 782 $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h |
| 784 $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h | 783 $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h |
| 785 endif | 784 endif |
| 786 | 785 |
| 787 CODEC_NAMES_SH := $(SRC_PATH)/$(SUBDIR)codec_names.sh | 786 CODEC_NAMES_SH := $(SRC_PATH)/$(SUBDIR)codec_names.sh |
| 788 AVCODEC_H := $(SRC_PATH)/$(SUBDIR)avcodec.h | 787 AVCODEC_H := $(SRC_PATH)/$(SUBDIR)avcodec.h |
| 789 $(SUBDIR)codec_names.h: $(CODEC_NAMES_SH) config.h $(AVCODEC_H) | 788 $(SUBDIR)codec_names.h: $(CODEC_NAMES_SH) config.h $(AVCODEC_H) |
| 790 $(CC) $(CPPFLAGS) $(CFLAGS) -E $(AVCODEC_H) | \ | 789 $(CC) $(CPPFLAGS) $(CFLAGS) -E $(AVCODEC_H) | \ |
| 791 $(CODEC_NAMES_SH) config.h $@ | 790 $(CODEC_NAMES_SH) config.h $@ |
| 792 $(SUBDIR)utils.o: $(SUBDIR)codec_names.h | 791 $(SUBDIR)utils.o: $(SUBDIR)codec_names.h |
| OLD | NEW |
