system-ffmpeg.patch

   1 diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
   2 index 17241b9..8a92312 100644
   3 --- a/media/filters/ffmpeg_glue.h
   4 +++ b/media/filters/ffmpeg_glue.h
   5 @@ -28,9 +28,9 @@
   6  #include "base/basictypes.h"
   7  #include "base/memory/scoped_ptr.h"
   8  #include "media/base/media_export.h"
   9 +#include "media/ffmpeg/ffmpeg_common.h"
  10
  11  struct AVFormatContext;
  12 -struct AVIOContext;
  13
  14  namespace media {
  15
  16 diff --git a/media/media.gyp b/media/media.gyp
  17 index df217d2..fde3830 100644
  18 --- a/media/media.gyp
  19 +++ b/media/media.gyp
  20 @@ -363,6 +363,9 @@
  21            'dependencies': [
  22              '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
  23            ],
  24 +          'export_dependent_settings': [
  25 +            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
  26 +          ],
  27          }, {  # use_ffmpeg == 0
  28            # Exclude the sources that depend on ffmpeg.
  29            'sources!': [
  30 diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
  31 index 81b770c..7b6d673 100644
  32 --- a/webkit/media/webkit_media.gypi
  33 +++ b/webkit/media/webkit_media.gypi
  34 @@ -24,6 +24,7 @@
  35        'dependencies': [
  36          '<(DEPTH)/base/base.gyp:base',
  37          '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
  38 +        '<(DEPTH)/media/media.gyp:media',
  39          '<(DEPTH)/media/media.gyp:shared_memory_support',
  40          '<(DEPTH)/media/media.gyp:yuv_convert',
  41          '<(DEPTH)/skia/skia.gyp:skia',