summaryrefslogtreecommitdiff
path: root/libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch')
-rw-r--r--libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch b/libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch
new file mode 100644
index 000000000..178c5897d
--- /dev/null
+++ b/libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch
@@ -0,0 +1,34 @@
+
+# HG changeset patch
+# User Jean-Yves Avenard <jyavenard@mozilla.com>
+# Date 1450657258 -39600
+# Node ID 8b0ced62c1957f6da6028af686c32ada1ccb570c
+# Parent e1a98377eb38679bda820456ee6d20bdc17eaa8e
+Bug 1233340: [ffmpeg] Support YUV420J pixel format. r=kentuckyfriedtakahe
+
+YUV420J is 12bpp YUV420P.
+
+
+diff --git a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
+--- a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
++++ b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
+@@ -52,17 +52,17 @@ FFmpegDataDecoder<LIBAV_VER>::~FFmpegDat
+ * For now, we just look for YUV420P as it is the only non-HW accelerated format
+ * supported by FFmpeg's H264 decoder.
+ */
+ static PixelFormat
+ ChoosePixelFormat(AVCodecContext* aCodecContext, const PixelFormat* aFormats)
+ {
+ FFMPEG_LOG("Choosing FFmpeg pixel format for video decoding.");
+ for (; *aFormats > -1; aFormats++) {
+- if (*aFormats == PIX_FMT_YUV420P) {
++ if (*aFormats == PIX_FMT_YUV420P || *aFormats == PIX_FMT_YUVJ420P) {
+ FFMPEG_LOG("Requesting pixel format YUV420P.");
+ return PIX_FMT_YUV420P;
+ }
+ }
+
+ NS_WARNING("FFmpeg does not share any supported pixel formats.");
+ return PIX_FMT_NONE;
+ }
+