[packages/chromium-browser/DEVEL] updated patch from gentoo, added AV_CODEC_ID_VP9 ifdefs

[glen]

commit b0ea35e34bb44e3f71ad52ac711c636bc9a7799c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Feb 26 23:07:42 2013 +0200

    updated patch from gentoo, added AV_CODEC_ID_VP9 ifdefs

 system-ffmpeg.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
---
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index 04cb6f5..12736c9 100644
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -39,3 +39,69 @@ index 81b770c..7b6d673 100644
          '<(DEPTH)/media/media.gyp:shared_memory_support',
          '<(DEPTH)/media/media.gyp:yuv_convert',
          '<(DEPTH)/skia/skia.gyp:skia',
+--- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
++++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
+@@ -10,6 +10,8 @@
+ #include "media/base/video_frame.h"
+ #include "media/base/video_util.h"
+ 
++#undef SampleFormat
++
+ namespace media {
+ 
+ // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
+@@ -84,8 +86,10 @@
+       return kCodecGSM_MS;
+     case CODEC_ID_PCM_MULAW:
+       return kCodecPCM_MULAW;
++#ifdef CODEC_ID_OPUS
+     case CODEC_ID_OPUS:
+       return kCodecOpus;
++#endif
+     default:
+       DVLOG(1) << "Unknown audio CodecID: " << codec_id;
+   }
+@@ -129,8 +133,10 @@
+       return CODEC_ID_GSM_MS;
+     case kCodecPCM_MULAW:
+       return CODEC_ID_PCM_MULAW;
++#ifdef CODEC_ID_OPUS
+     case kCodecOpus:
+       return CODEC_ID_OPUS;
++#endif
+     default:
+       DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
+   }
+@@ -153,8 +153,10 @@
+       return kCodecMPEG4;
+     case CODEC_ID_VP8:
+       return kCodecVP8;
++#ifdef AV_CODEC_ID_VP9:
+     case AV_CODEC_ID_VP9:
+       return kCodecVP9;
++#endif
+     default:
+       DVLOG(1) << "Unknown video CodecID: " << codec_id;
+   }
+@@ -171,8 +173,10 @@
+       return CODEC_ID_MPEG4;
+     case kCodecVP8:
+       return CODEC_ID_VP8;
++#ifdef AV_CODEC_ID_VP9:
+     case kCodecVP9:
+       return AV_CODEC_ID_VP9;
++#endif
+     default:
+       DVLOG(1) << "Unknown VideoCodec: " << video_codec;
+   }
+@@ -423,8 +429,10 @@
+       return CHANNEL_LAYOUT_6_1_FRONT;
+     case AV_CH_LAYOUT_7POINT0_FRONT:
+       return CHANNEL_LAYOUT_7_0_FRONT;
++#ifdef AV_CH_LAYOUT_7POINT1_WIDE_BACK
+     case AV_CH_LAYOUT_7POINT1_WIDE_BACK:
+       return CHANNEL_LAYOUT_7_1_WIDE_BACK;
++#endif
+     case AV_CH_LAYOUT_OCTAGONAL:
+       return CHANNEL_LAYOUT_OCTAGONAL;
+     default:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/b0ea35e34bb44e3f71ad52ac711c636bc9a7799c