system-ffmpeg.patch

   1 --- chromium-browser-27.0.1453.3/tools/compile_test/compile_test.py~    2013-03-27 03:14:02.000000000 +0200
   2 +++ chromium-browser-27.0.1453.3/tools/compile_test/compile_test.py     2013-03-27 23:48:09.802791538 +0200
   3 @@ -40,6 +40,7 @@
   4      o_path = os.path.join(tmpdir, 'test.o')
   5
   6      cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
   7 +                                 shell=True,
   8                                   stdout=subprocess.PIPE,
   9                                   stderr=subprocess.PIPE)
  10      cxx_stdout, cxx_stderr = cxx_popen.communicate()
  11 diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
  12 index 17241b9..8a92312 100644
  13 --- a/media/filters/ffmpeg_glue.h
  14 +++ b/media/filters/ffmpeg_glue.h
  15 @@ -28,9 +28,9 @@
  16  #include "base/basictypes.h"
  17  #include "base/memory/scoped_ptr.h"
  18  #include "media/base/media_export.h"
  19 +#include "media/ffmpeg/ffmpeg_common.h"
  20
  21  struct AVFormatContext;
  22 -struct AVIOContext;
  23
  24  namespace media {
  25
  26 diff --git a/media/media.gyp b/media/media.gyp
  27 index df217d2..fde3830 100644
  28 --- a/media/media.gyp
  29 +++ b/media/media.gyp
  30 @@ -363,6 +363,9 @@
  31            'dependencies': [
  32              '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
  33            ],
  34 +          'export_dependent_settings': [
  35 +            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
  36 +          ],
  37          }, {  # media_use_ffmpeg == 0
  38            # Exclude the sources that depend on ffmpeg.
  39            'sources!': [
  40 --- a/media/ffmpeg/ffmpeg_common.cc.orig        2013-01-17 00:07:51.635057013 +0000
  41 +++ b/media/ffmpeg/ffmpeg_common.cc     2013-01-17 00:15:50.867406811 +0000
  42 @@ -10,6 +10,8 @@
  43  #include "media/base/video_frame.h"
  44  #include "media/base/video_util.h"
  45
  46 +#undef SampleFormat
  47 +
  48  namespace media {
  49
  50  // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are