1 --- a/media/filters/ffmpeg_glue.h
2 +++ b/media/filters/ffmpeg_glue.h
4 #include "base/basictypes.h"
5 #include "base/memory/scoped_ptr.h"
6 #include "media/base/media_export.h"
7 +#include "media/ffmpeg/ffmpeg_common.h"
9 struct AVFormatContext;
14 --- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000
15 +++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000
18 case AV_CODEC_ID_PCM_MULAW:
19 return kCodecPCM_MULAW;
20 +#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
21 case AV_CODEC_ID_OPUS:
25 DVLOG(1) << "Unknown audio CodecID: " << codec_id;
28 return AV_CODEC_ID_GSM_MS;
30 return AV_CODEC_ID_PCM_MULAW;
31 +#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
33 return AV_CODEC_ID_OPUS;
36 DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
42 +#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
47 DVLOG(1) << "Unknown video CodecID: " << codec_id;
50 return AV_CODEC_ID_MPEG4;
52 return AV_CODEC_ID_VP8;
53 +#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
55 return AV_CODEC_ID_VP9;
58 DVLOG(1) << "Unknown VideoCodec: " << video_codec;
60 --- a/media/filters/ffmpeg_demuxer.cc.orig 2013-05-09 18:04:25.089276403 +0000
61 +++ b/media/filters/ffmpeg_demuxer.cc 2013-05-09 18:05:16.289599070 +0000
63 // Get side data if any. For now, the only type of side_data is VP8 Alpha. We
64 // keep this generic so that other side_data types in the future can be
65 // handled the same way as well.
66 - av_packet_split_side_data(packet.get());
67 int side_data_size = 0;
68 - uint8* side_data = av_packet_get_side_data(
69 + uint8* side_data = NULL;
70 +#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL
71 + av_packet_split_side_data(packet.get());
72 + side_data = av_packet_get_side_data(
74 AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
78 // If a packet is returned by FFmpeg's av_parser_parse2() the packet will
79 // reference inner memory of FFmpeg. As such we should transfer the packet
80 --- a/media/base/media_posix.cc.orig 2013-05-24 20:59:12.963046035 +0000
81 +++ b/media/base/media_posix.cc 2013-05-24 20:59:50.593275882 +0000
83 #include "base/path_service.h"
84 #include "base/strings/stringize_macros.h"
85 #include "media/ffmpeg/ffmpeg_common.h"
87 +#if !defined(USE_SYSTEM_FFMPEG)
88 #include "third_party/ffmpeg/ffmpeg_stubs.h"
90 using third_party_ffmpeg::kNumStubModules;
91 using third_party_ffmpeg::kModuleFfmpegsumo;
92 using third_party_ffmpeg::InitializeStubs;
93 using third_party_ffmpeg::StubPathMap;
101 bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
102 +#if defined(USE_SYSTEM_FFMPEG)
107 // First try to initialize with Chrome's sumo library.
109 FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value());
111 return InitializeStubs(paths);
115 } // namespace internal