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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/Makefile

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/patched-ffmpeg-mt/ffplay.c ('k') | source/patched-ffmpeg-mt/libavcodec/a64colors.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # removing avcore dependency to avoid adding dll to installer/loader. 5 # removing avcore dependency to avoid adding dll to installer/loader.
6 #FFLIBS = avutil avcore 6 #FFLIBS = avutil avcore
7 7
8 HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h 8 HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h
9 9
10 OBJS = allcodecs.o \ 10 OBJS = allcodecs.o \
(...skipping 30 matching lines...) Expand all
41 OBJS-$(CONFIG_HUFFMAN) += huffman.o 41 OBJS-$(CONFIG_HUFFMAN) += huffman.o
42 OBJS-$(CONFIG_LPC) += lpc.o 42 OBJS-$(CONFIG_LPC) += lpc.o
43 OBJS-$(CONFIG_LSP) += lsp.o 43 OBJS-$(CONFIG_LSP) += lsp.o
44 OBJS-$(CONFIG_MDCT) += mdct.o 44 OBJS-$(CONFIG_MDCT) += mdct.o
45 RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o 45 RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o
46 OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) 46 OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes)
47 OBJS-$(CONFIG_VAAPI) += vaapi.o 47 OBJS-$(CONFIG_VAAPI) += vaapi.o
48 OBJS-$(CONFIG_VDPAU) += vdpau.o 48 OBJS-$(CONFIG_VDPAU) += vdpau.o
49 49
50 # decoders/encoders/hardware accelerators 50 # decoders/encoders/hardware accelerators
51 OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o
52 OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o
51 OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \ 53 OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \
52 aacadtsdec.o mpeg4audio.o 54 aacadtsdec.o mpeg4audio.o
53 OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ 55 OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
54 aacpsy.o aactab.o \ 56 aacpsy.o aactab.o \
55 psymodel.o iirfilter.o \ 57 psymodel.o iirfilter.o \
56 mpeg4audio.o 58 mpeg4audio.o
57 OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o 59 OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
58 OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o 60 OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o
59 OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o 61 OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
60 OBJS-$(CONFIG_ALAC_DECODER) += alac.o 62 OBJS-$(CONFIG_ALAC_DECODER) += alac.o
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.o 472 OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.o
471 OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adxdec.o 473 OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adxdec.o
472 OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adxenc.o 474 OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adxenc.o
473 OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o 475 OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o
474 OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.o 476 OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.o
475 OBJS-$(CONFIG_ADPCM_EA_MAXIS_XA_DECODER) += adpcm.o 477 OBJS-$(CONFIG_ADPCM_EA_MAXIS_XA_DECODER) += adpcm.o
476 OBJS-$(CONFIG_ADPCM_EA_R1_DECODER) += adpcm.o 478 OBJS-$(CONFIG_ADPCM_EA_R1_DECODER) += adpcm.o
477 OBJS-$(CONFIG_ADPCM_EA_R2_DECODER) += adpcm.o 479 OBJS-$(CONFIG_ADPCM_EA_R2_DECODER) += adpcm.o
478 OBJS-$(CONFIG_ADPCM_EA_R3_DECODER) += adpcm.o 480 OBJS-$(CONFIG_ADPCM_EA_R3_DECODER) += adpcm.o
479 OBJS-$(CONFIG_ADPCM_EA_XAS_DECODER) += adpcm.o 481 OBJS-$(CONFIG_ADPCM_EA_XAS_DECODER) += adpcm.o
482 OBJS-$(CONFIG_ADPCM_G722_DECODER) += g722.o
480 OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o 483 OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o
481 OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o 484 OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o
482 OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o 485 OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o
483 OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.o 486 OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.o
484 OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.o 487 OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.o
485 OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER) += adpcm.o 488 OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER) += adpcm.o
486 OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER) += adpcm.o 489 OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER) += adpcm.o
487 OBJS-$(CONFIG_ADPCM_IMA_ISS_DECODER) += adpcm.o 490 OBJS-$(CONFIG_ADPCM_IMA_ISS_DECODER) += adpcm.o
488 OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.o 491 OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.o
489 OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcm.o 492 OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcm.o
(...skipping 26 matching lines...) Expand all
516 OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += xiph.o mpeg4audio.o \ 519 OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += xiph.o mpeg4audio.o \
517 flacdec.o flacdata.o flac.o 520 flacdec.o flacdata.o flac.o
518 OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o 521 OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o
519 OBJS-$(CONFIG_MATROSKA_MUXER) += xiph.o mpeg4audio.o \ 522 OBJS-$(CONFIG_MATROSKA_MUXER) += xiph.o mpeg4audio.o \
520 flacdec.o flacdata.o flac.o 523 flacdec.o flacdata.o flac.o
521 OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o 524 OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o
522 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o 525 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o mpeg4audio.o
523 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o 526 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o
524 OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o 527 OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o
525 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o 528 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o
526 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o 529 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o xiph.o
527 OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \ 530 OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \
528 flacdec.o flacdata.o flac.o 531 flacdec.o flacdata.o flac.o
529 532
530 # external codec libraries 533 # external codec libraries
531 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o 534 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o
532 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o 535 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o
533 OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o 536 OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o
534 OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o 537 OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o
535 OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o 538 OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o
536 OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o 539 OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 SKIPHEADERS-$(CONFIG_LIBDIRAC) += libdirac.h 641 SKIPHEADERS-$(CONFIG_LIBDIRAC) += libdirac.h
639 SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h 642 SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
640 SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h 643 SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
641 SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h 644 SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h
642 SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h 645 SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h
643 SKIPHEADERS += mpegaudio3.h 646 SKIPHEADERS += mpegaudio3.h
644 647
645 EXAMPLES = api 648 EXAMPLES = api
646 649
647 TESTPROGS = cabac dct eval fft h264 iirfilter rangecoder snow 650 TESTPROGS = cabac dct eval fft h264 iirfilter rangecoder snow
648 TESTPROGS-$(ARCH_X86) += x86/cpuid
649 TESTPROGS-$(HAVE_MMX) += motion 651 TESTPROGS-$(HAVE_MMX) += motion
650 TESTOBJS = dctref.o 652 TESTOBJS = dctref.o
651 653
652 HOSTPROGS = costablegen 654 HOSTPROGS = costablegen
653 655
654 DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86 656 DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
655 657
656 CLEANFILES = sin_tables.c cos_tables.c *_tables.h *_tablegen$(HOSTEXESUF) 658 CLEANFILES = sin_tables.c cos_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
657 659
658 include $(SUBDIR)../subdir.mak 660 include $(SUBDIR)../subdir.mak
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h 697 $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h
696 $(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h 698 $(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h
697 $(SUBDIR)dv.o: $(SUBDIR)dv_tables.h 699 $(SUBDIR)dv.o: $(SUBDIR)dv_tables.h
698 $(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h 700 $(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h
699 $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h 701 $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h
700 $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h 702 $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h
701 $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h 703 $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
702 $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h 704 $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h
703 $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h 705 $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h
704 endif 706 endif
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/ffplay.c ('k') | source/patched-ffmpeg-mt/libavcodec/a64colors.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698