third_party/ffmpeg/source/config/Chrome/win/ia32/config.h - Issue 1733020: ffmpeg disable zlib explicitely in the configuration

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1733020: ffmpeg disable zlib explicitely in the configuration (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | third_party/ffmpeg/source/config/Chromium/win/ia32/config.h » ('j') | no next file with comments »

OLD	NEW
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 --enable-decoder=the ora --enable-decoder=vorbis --enable-demuxer=ogg --enable-decoder=aac --enable-d ecoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --ena ble-parser=mpegaudio --enable-pthreads --enable-yasm --enable-memalign-hack --cc =gcc-sjlj --extra-cflags=-O2 --prefix=./chrome-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 =aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-de muxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --enable-mem align-hack --cc=gcc-sjlj --prefix=./chrome-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 "./chrome-ffmpeg/share/ffmpeg"	6 #define FFMPEG_DATADIR "./chrome-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 854 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
869 #define CONFIG_OSS_INDEV 0	869 #define CONFIG_OSS_INDEV 0

870 #define CONFIG_V4L2_INDEV 0	870 #define CONFIG_V4L2_INDEV 0

871 #define CONFIG_V4L_INDEV 0	871 #define CONFIG_V4L_INDEV 0

872 #define CONFIG_VFWCAP_INDEV 0	872 #define CONFIG_VFWCAP_INDEV 0

873 #define CONFIG_X11_GRAB_DEVICE_INDEV 0	873 #define CONFIG_X11_GRAB_DEVICE_INDEV 0

874 #define CONFIG_LIBDC1394_INDEV 0	874 #define CONFIG_LIBDC1394_INDEV 0

875 #define CONFIG_ALSA_OUTDEV 0	875 #define CONFIG_ALSA_OUTDEV 0

876 #define CONFIG_AUDIO_BEOS_OUTDEV 0	876 #define CONFIG_AUDIO_BEOS_OUTDEV 0

877 #define CONFIG_OSS_OUTDEV 0	877 #define CONFIG_OSS_OUTDEV 0

878 #endif /* FFMPEG_CONFIG_H */	878 #endif /* FFMPEG_CONFIG_H */

OLD	NEW