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

Side by Side Diff: third_party/ffmpeg/source/config/Chromium/win/ia32/config.h

Issue 2093007: Chromium side changes for enabling VP8 and WebM support. (Closed)
Patch Set: Final fixes Created 10 years, 7 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
OLDNEW
1 /* Automatically generated by configure - do not modify! */ 1 /* Automatically generated by configure - do not modify! */
2 #ifndef FFMPEG_CONFIG_H 2 #ifndef FFMPEG_CONFIG_H
3 #define FFMPEG_CONFIG_H 3 #define FFMPEG_CONFIG_H
4 #define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserv er --disable-ffprobe --enable-shared --disable-static --disable-debug --disable- network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxer s --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disa ble-devices --disable-filters --disable-gpl --disable-bzlib --disable-zlib --ena ble-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthread s --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix=./chromium-ffmpeg" 4 #define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserv er --disable-ffprobe --enable-shared --disable-static --disable-debug --disable- network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxer s --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disa ble-devices --disable-filters --disable-gpl --disable-bzlib --disable-zlib --ena ble-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-decoder =libvpx_vp8 --enable-demuxer=webm --extra-cflags='-O2 -I/d/src/vp8/decode/includ e -fno-strict-aliasing' --extra-ldflags=-L/d/src/vp8/decode/lib --extra-libs=-lv px --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix =./chromium-ffmpeg"
5 #define FFMPEG_LICENSE "LGPL version 2.1 or later" 5 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
6 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg" 6 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
7 #define CC_TYPE "gcc" 7 #define CC_TYPE "gcc"
8 #define CC_VERSION __VERSION__ 8 #define CC_VERSION __VERSION__
9 #define restrict restrict 9 #define restrict restrict
10 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t" 10 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
11 #define EXTERN_PREFIX "_" 11 #define EXTERN_PREFIX "_"
12 #define EXTERN_ASM _ 12 #define EXTERN_ASM _
13 #define ARCH_ALPHA 0 13 #define ARCH_ALPHA 0
14 #define ARCH_ARM 0 14 #define ARCH_ARM 0
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 #define CONFIG_XSUB_DECODER 0 468 #define CONFIG_XSUB_DECODER 0
469 #define CONFIG_LIBDIRAC_DECODER 0 469 #define CONFIG_LIBDIRAC_DECODER 0
470 #define CONFIG_LIBFAAD_DECODER 0 470 #define CONFIG_LIBFAAD_DECODER 0
471 #define CONFIG_LIBGSM_DECODER 0 471 #define CONFIG_LIBGSM_DECODER 0
472 #define CONFIG_LIBGSM_MS_DECODER 0 472 #define CONFIG_LIBGSM_MS_DECODER 0
473 #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 473 #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
474 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 474 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
475 #define CONFIG_LIBOPENJPEG_DECODER 0 475 #define CONFIG_LIBOPENJPEG_DECODER 0
476 #define CONFIG_LIBSCHROEDINGER_DECODER 0 476 #define CONFIG_LIBSCHROEDINGER_DECODER 0
477 #define CONFIG_LIBSPEEX_DECODER 0 477 #define CONFIG_LIBSPEEX_DECODER 0
478 #define CONFIG_LIBVPX_VP8_DECODER 1
478 #define CONFIG_ASV1_ENCODER 0 479 #define CONFIG_ASV1_ENCODER 0
479 #define CONFIG_ASV2_ENCODER 0 480 #define CONFIG_ASV2_ENCODER 0
480 #define CONFIG_BMP_ENCODER 0 481 #define CONFIG_BMP_ENCODER 0
481 #define CONFIG_DNXHD_ENCODER 0 482 #define CONFIG_DNXHD_ENCODER 0
482 #define CONFIG_DVVIDEO_ENCODER 0 483 #define CONFIG_DVVIDEO_ENCODER 0
483 #define CONFIG_FFV1_ENCODER 0 484 #define CONFIG_FFV1_ENCODER 0
484 #define CONFIG_FFVHUFF_ENCODER 0 485 #define CONFIG_FFVHUFF_ENCODER 0
485 #define CONFIG_FLASHSV_ENCODER 0 486 #define CONFIG_FLASHSV_ENCODER 0
486 #define CONFIG_FLV_ENCODER 0 487 #define CONFIG_FLV_ENCODER 0
487 #define CONFIG_GIF_ENCODER 0 488 #define CONFIG_GIF_ENCODER 0
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 #define CONFIG_XSUB_ENCODER 0 567 #define CONFIG_XSUB_ENCODER 0
567 #define CONFIG_LIBDIRAC_ENCODER 0 568 #define CONFIG_LIBDIRAC_ENCODER 0
568 #define CONFIG_LIBFAAC_ENCODER 0 569 #define CONFIG_LIBFAAC_ENCODER 0
569 #define CONFIG_LIBGSM_ENCODER 0 570 #define CONFIG_LIBGSM_ENCODER 0
570 #define CONFIG_LIBGSM_MS_ENCODER 0 571 #define CONFIG_LIBGSM_MS_ENCODER 0
571 #define CONFIG_LIBMP3LAME_ENCODER 0 572 #define CONFIG_LIBMP3LAME_ENCODER 0
572 #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 573 #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
573 #define CONFIG_LIBSCHROEDINGER_ENCODER 0 574 #define CONFIG_LIBSCHROEDINGER_ENCODER 0
574 #define CONFIG_LIBTHEORA_ENCODER 0 575 #define CONFIG_LIBTHEORA_ENCODER 0
575 #define CONFIG_LIBVORBIS_ENCODER 0 576 #define CONFIG_LIBVORBIS_ENCODER 0
577 #define CONFIG_LIBVPX_VP8_ENCODER 0
576 #define CONFIG_LIBX264_ENCODER 0 578 #define CONFIG_LIBX264_ENCODER 0
577 #define CONFIG_LIBXVID_ENCODER 0 579 #define CONFIG_LIBXVID_ENCODER 0
578 #define CONFIG_H263_VAAPI_HWACCEL 0 580 #define CONFIG_H263_VAAPI_HWACCEL 0
579 #define CONFIG_H264_DXVA2_HWACCEL 0 581 #define CONFIG_H264_DXVA2_HWACCEL 0
580 #define CONFIG_H264_VAAPI_HWACCEL 0 582 #define CONFIG_H264_VAAPI_HWACCEL 0
581 #define CONFIG_MPEG2_VAAPI_HWACCEL 0 583 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
582 #define CONFIG_MPEG4_VAAPI_HWACCEL 0 584 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
583 #define CONFIG_VC1_DXVA2_HWACCEL 0 585 #define CONFIG_VC1_DXVA2_HWACCEL 0
584 #define CONFIG_VC1_VAAPI_HWACCEL 0 586 #define CONFIG_VC1_VAAPI_HWACCEL 0
585 #define CONFIG_WMV3_DXVA2_HWACCEL 0 587 #define CONFIG_WMV3_DXVA2_HWACCEL 0
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 #define CONFIG_TTA_DEMUXER 0 739 #define CONFIG_TTA_DEMUXER 0
738 #define CONFIG_TXD_DEMUXER 0 740 #define CONFIG_TXD_DEMUXER 0
739 #define CONFIG_VC1_DEMUXER 0 741 #define CONFIG_VC1_DEMUXER 0
740 #define CONFIG_VC1T_DEMUXER 0 742 #define CONFIG_VC1T_DEMUXER 0
741 #define CONFIG_VMD_DEMUXER 0 743 #define CONFIG_VMD_DEMUXER 0
742 #define CONFIG_VOC_DEMUXER 0 744 #define CONFIG_VOC_DEMUXER 0
743 #define CONFIG_VQF_DEMUXER 0 745 #define CONFIG_VQF_DEMUXER 0
744 #define CONFIG_W64_DEMUXER 0 746 #define CONFIG_W64_DEMUXER 0
745 #define CONFIG_WAV_DEMUXER 0 747 #define CONFIG_WAV_DEMUXER 0
746 #define CONFIG_WC3_DEMUXER 0 748 #define CONFIG_WC3_DEMUXER 0
749 #define CONFIG_WEBM_DEMUXER 1
747 #define CONFIG_WSAUD_DEMUXER 0 750 #define CONFIG_WSAUD_DEMUXER 0
748 #define CONFIG_WSVQA_DEMUXER 0 751 #define CONFIG_WSVQA_DEMUXER 0
749 #define CONFIG_WV_DEMUXER 0 752 #define CONFIG_WV_DEMUXER 0
750 #define CONFIG_XA_DEMUXER 0 753 #define CONFIG_XA_DEMUXER 0
751 #define CONFIG_YUV4MPEGPIPE_DEMUXER 0 754 #define CONFIG_YUV4MPEGPIPE_DEMUXER 0
752 #define CONFIG_LIBNUT_DEMUXER 0 755 #define CONFIG_LIBNUT_DEMUXER 0
753 #define CONFIG_AC3_MUXER 0 756 #define CONFIG_AC3_MUXER 0
754 #define CONFIG_ADTS_MUXER 0 757 #define CONFIG_ADTS_MUXER 0
755 #define CONFIG_AIFF_MUXER 0 758 #define CONFIG_AIFF_MUXER 0
756 #define CONFIG_AMR_MUXER 0 759 #define CONFIG_AMR_MUXER 0
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 #define CONFIG_RTSP_MUXER 0 835 #define CONFIG_RTSP_MUXER 0
833 #define CONFIG_SOX_MUXER 0 836 #define CONFIG_SOX_MUXER 0
834 #define CONFIG_SPDIF_MUXER 0 837 #define CONFIG_SPDIF_MUXER 0
835 #define CONFIG_SWF_MUXER 0 838 #define CONFIG_SWF_MUXER 0
836 #define CONFIG_TG2_MUXER 0 839 #define CONFIG_TG2_MUXER 0
837 #define CONFIG_TGP_MUXER 0 840 #define CONFIG_TGP_MUXER 0
838 #define CONFIG_TRUEHD_MUXER 0 841 #define CONFIG_TRUEHD_MUXER 0
839 #define CONFIG_VC1T_MUXER 0 842 #define CONFIG_VC1T_MUXER 0
840 #define CONFIG_VOC_MUXER 0 843 #define CONFIG_VOC_MUXER 0
841 #define CONFIG_WAV_MUXER 0 844 #define CONFIG_WAV_MUXER 0
845 #define CONFIG_WEBM_MUXER 0
842 #define CONFIG_YUV4MPEGPIPE_MUXER 0 846 #define CONFIG_YUV4MPEGPIPE_MUXER 0
843 #define CONFIG_LIBNUT_MUXER 0 847 #define CONFIG_LIBNUT_MUXER 0
844 #define CONFIG_ASPECT_FILTER 0 848 #define CONFIG_ASPECT_FILTER 0
845 #define CONFIG_CROP_FILTER 0 849 #define CONFIG_CROP_FILTER 0
846 #define CONFIG_FORMAT_FILTER 0 850 #define CONFIG_FORMAT_FILTER 0
847 #define CONFIG_NOFORMAT_FILTER 0 851 #define CONFIG_NOFORMAT_FILTER 0
848 #define CONFIG_NULL_FILTER 0 852 #define CONFIG_NULL_FILTER 0
849 #define CONFIG_PIXELASPECT_FILTER 0 853 #define CONFIG_PIXELASPECT_FILTER 0
850 #define CONFIG_SCALE_FILTER 0 854 #define CONFIG_SCALE_FILTER 0
851 #define CONFIG_SLICIFY_FILTER 0 855 #define CONFIG_SLICIFY_FILTER 0
(...skipping 17 matching lines...) Expand all
869 #define CONFIG_OSS_INDEV 0 873 #define CONFIG_OSS_INDEV 0
870 #define CONFIG_V4L2_INDEV 0 874 #define CONFIG_V4L2_INDEV 0
871 #define CONFIG_V4L_INDEV 0 875 #define CONFIG_V4L_INDEV 0
872 #define CONFIG_VFWCAP_INDEV 0 876 #define CONFIG_VFWCAP_INDEV 0
873 #define CONFIG_X11_GRAB_DEVICE_INDEV 0 877 #define CONFIG_X11_GRAB_DEVICE_INDEV 0
874 #define CONFIG_LIBDC1394_INDEV 0 878 #define CONFIG_LIBDC1394_INDEV 0
875 #define CONFIG_ALSA_OUTDEV 0 879 #define CONFIG_ALSA_OUTDEV 0
876 #define CONFIG_AUDIO_BEOS_OUTDEV 0 880 #define CONFIG_AUDIO_BEOS_OUTDEV 0
877 #define CONFIG_OSS_OUTDEV 0 881 #define CONFIG_OSS_OUTDEV 0
878 #endif /* FFMPEG_CONFIG_H */ 882 #endif /* FFMPEG_CONFIG_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698