diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 20:39:26 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 20:39:26 +0000 |
| commit | f24cf43009e6c9873591fcafa60f1913b5436273 (patch) | |
| tree | 8c28db49f169d7a25d947e4bcee180cc1a0077c5 /third_party/ffmpeg | |
| parent | d5d0994056a4938507b170a707e1afbca29a55c1 (diff) | |
| download | chromium_src-f24cf43009e6c9873591fcafa60f1913b5436273.zip chromium_src-f24cf43009e6c9873591fcafa60f1913b5436273.tar.gz chromium_src-f24cf43009e6c9873591fcafa60f1913b5436273.tar.bz2 | |
Roll FFmpeg deps in third party
Roll FFmpeg deps to include latest build fix.
Review URL: http://codereview.chromium.org/466026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
6 files changed, 6 insertions, 0 deletions
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h index ad299e0..b242ccc 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h @@ -519,6 +519,7 @@ #define CONFIG_VP3_PARSER 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 #define CONFIG_H264_MP4TOANNEXB_BSF 1 +#define CONFIG_MPEG4VIDEO_ES_BSF 0 #define CONFIG_IMX_DUMP_HEADER_BSF 0 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 diff --git a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h index 2ce3f54..213f2f4 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h @@ -519,6 +519,7 @@ #define CONFIG_VP3_PARSER 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 #define CONFIG_H264_MP4TOANNEXB_BSF 1 +#define CONFIG_MPEG4VIDEO_ES_BSF 0 #define CONFIG_IMX_DUMP_HEADER_BSF 0 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 diff --git a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h index fd827c7..6fc49d2 100644 --- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h @@ -519,6 +519,7 @@ #define CONFIG_VP3_PARSER 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 #define CONFIG_H264_MP4TOANNEXB_BSF 1 +#define CONFIG_MPEG4VIDEO_ES_BSF 0 #define CONFIG_IMX_DUMP_HEADER_BSF 0 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 diff --git a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h index fa091cb..e9d9276 100644 --- a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h @@ -519,6 +519,7 @@ #define CONFIG_VP3_PARSER 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 #define CONFIG_H264_MP4TOANNEXB_BSF 0 +#define CONFIG_MPEG4VIDEO_ES_BSF 0 #define CONFIG_IMX_DUMP_HEADER_BSF 0 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 diff --git a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h b/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h index b20acc7e..b249641 100644 --- a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h +++ b/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h @@ -519,6 +519,7 @@ #define CONFIG_VP3_PARSER 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 #define CONFIG_H264_MP4TOANNEXB_BSF 0 +#define CONFIG_MPEG4VIDEO_ES_BSF 0 #define CONFIG_IMX_DUMP_HEADER_BSF 0 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 diff --git a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h index 68eeba3..3ea9cd7 100644 --- a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h @@ -519,6 +519,7 @@ #define CONFIG_VP3_PARSER 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 #define CONFIG_H264_MP4TOANNEXB_BSF 0 +#define CONFIG_MPEG4VIDEO_ES_BSF 0 #define CONFIG_IMX_DUMP_HEADER_BSF 0 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 |