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

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

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/patched-ffmpeg-mt/ffserver.c ('k') | source/patched-ffmpeg-mt/libavcodec/aacdec.c » ('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 5
6 HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h 6 HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.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 24 matching lines...) Expand all
35 OBJS-$(CONFIG_H264DSP) += h264dsp.o h264idct.o h264pred.o 35 OBJS-$(CONFIG_H264DSP) += h264dsp.o h264idct.o h264pred.o
36 OBJS-$(CONFIG_LPC) += lpc.o 36 OBJS-$(CONFIG_LPC) += lpc.o
37 OBJS-$(CONFIG_LSP) += lsp.o 37 OBJS-$(CONFIG_LSP) += lsp.o
38 OBJS-$(CONFIG_MDCT) += mdct.o 38 OBJS-$(CONFIG_MDCT) += mdct.o
39 RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o 39 RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o
40 OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) 40 OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes)
41 OBJS-$(CONFIG_VAAPI) += vaapi.o 41 OBJS-$(CONFIG_VAAPI) += vaapi.o
42 OBJS-$(CONFIG_VDPAU) += vdpau.o 42 OBJS-$(CONFIG_VDPAU) += vdpau.o
43 43
44 # decoders/encoders/hardware accelerators 44 # decoders/encoders/hardware accelerators
45 OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o 45 OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o ps.o
46 OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ 46 OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
47 aacpsy.o aactab.o \ 47 aacpsy.o aactab.o \
48 psymodel.o iirfilter.o \ 48 psymodel.o iirfilter.o \
49 mpeg4audio.o 49 mpeg4audio.o
50 OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o 50 OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
51 OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o 51 OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o
52 OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o 52 OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
53 OBJS-$(CONFIG_ALAC_DECODER) += alac.o 53 OBJS-$(CONFIG_ALAC_DECODER) += alac.o
54 OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o 54 OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o
55 OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o 55 OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 mpegaudiodata.o 221 mpegaudiodata.o
222 OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o \ 222 OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o \
223 mpegvideo.o error_resilience.o 223 mpegvideo.o error_resilience.o
224 OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o 224 OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o
225 OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o \ 225 OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o \
226 mpegvideo.o error_resilience.o 226 mpegvideo.o error_resilience.o
227 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpegvideo_enc.o \ 227 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpegvideo_enc.o \
228 motion_est.o ratecontrol.o \ 228 motion_est.o ratecontrol.o \
229 mpeg12.o mpeg12data.o \ 229 mpeg12.o mpeg12data.o \
230 mpegvideo.o error_resilience.o 230 mpegvideo.o error_resilience.o
231 OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o
231 OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o 232 OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o
232 OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o \ 233 OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o \
233 mpegvideo.o error_resilience.o 234 mpegvideo.o error_resilience.o
234 OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpegvideo_enc.o \ 235 OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpegvideo_enc.o \
235 motion_est.o ratecontrol.o \ 236 motion_est.o ratecontrol.o \
236 mpeg12.o mpeg12data.o \ 237 mpeg12.o mpeg12data.o \
237 mpegvideo.o error_resilience.o 238 mpegvideo.o error_resilience.o
238 OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o 239 OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o
239 OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o 240 OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o
240 OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \ 241 OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o 513 OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o
513 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o 514 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o
514 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o 515 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o
515 OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \ 516 OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \
516 flacdec.o flacdata.o flac.o 517 flacdec.o flacdata.o flac.o
517 518
518 # external codec libraries 519 # external codec libraries
519 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o 520 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o
520 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o 521 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o
521 OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o 522 OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o
522 OBJS-$(CONFIG_LIBFAAD_DECODER) += libfaad.o
523 OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o 523 OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o
524 OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o 524 OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o
525 OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o 525 OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o
526 OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsm.o 526 OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsm.o
527 OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o 527 OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o
528 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o 528 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o
529 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o 529 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o
530 OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o 530 OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o
531 OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpeg.o 531 OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpeg.o
532 OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o \ 532 OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o \
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 $(M)./$< > $@ 669 $(M)./$< > $@
670 670
671 ifdef CONFIG_HARDCODED_TABLES 671 ifdef CONFIG_HARDCODED_TABLES
672 $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h 672 $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h
673 $(SUBDIR)dv.o: $(SUBDIR)dv_tables.h 673 $(SUBDIR)dv.o: $(SUBDIR)dv_tables.h
674 $(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h 674 $(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h
675 $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h 675 $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h
676 $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h 676 $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h
677 $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h 677 $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
678 $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h 678 $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h
679 $(SUBDIR)ps.o: $(SUBDIR)ps_tables.h
679 $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h 680 $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h
680 endif 681 endif
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/ffserver.c ('k') | source/patched-ffmpeg-mt/libavcodec/aacdec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698