ffmpeg-rpi: try to port from LibreELEC

1 files changed, 55 insertions, 0 deletions

diff --git a/ffmpeg-rpi/ffmpeg-99.1001-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch b/ffmpeg-rpi/ffmpeg-99.1001-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch
new file mode 100644
index 0000000..37b53e8
--- /dev/null
+++ b/ffmpeg-rpi/ffmpeg-99.1001-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch
@@ -0,0 +1,55 @@
+From 7adc8f706efab65d8d7e5f960690faca3d5c190d Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Sat, 4 Mar 2017 19:24:02 +0000
+Subject: [PATCH] ffmpeg: Call get_format to fix an issue with MMAL rendering
+
+---
+ libavcodec/dvdec.c | 7 +++++++
+ libavcodec/rv34.c  | 6 +++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
+index 0b4c1bc..00081ef 100644
+--- a/libavcodec/dvdec.c
++++ b/libavcodec/dvdec.c
+@@ -49,6 +49,7 @@
+ #include "internal.h"
+ #include "put_bits.h"
+ #include "simple_idct.h"
++#include "thread.h"
+ 
+ typedef struct BlockInfo {
+     const uint32_t *factor_table;
+@@ -196,6 +197,12 @@ static av_cold int dvvideo_decode_init(AVCodecContext *avctx)
+     s->idct_put[0] = idsp.idct_put;
+     s->idct_put[1] = ff_simple_idct248_put;
+ 
++    static const enum AVPixelFormat pix_fmts[] = {
++       AV_PIX_FMT_YUV420P,
++       AV_PIX_FMT_NONE
++    };
++    avctx->pix_fmt = ff_get_format(avctx, pix_fmts);
++
+     return ff_dvvideo_init(avctx);
+ }
+ 
+diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
+index aca8382..f473f6c 100644
+--- a/libavcodec/rv34.c
++++ b/libavcodec/rv34.c
+@@ -1493,7 +1493,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
+     ff_mpv_decode_init(s, avctx);
+     s->out_format = FMT_H263;
+ 
+-    avctx->pix_fmt = AV_PIX_FMT_YUV420P;
++    static const enum AVPixelFormat pix_fmts[] = {
++       AV_PIX_FMT_YUV420P,
++       AV_PIX_FMT_NONE
++    };
++    avctx->pix_fmt = ff_get_format(avctx, pix_fmts);
+     avctx->has_b_frames = 1;
+     s->low_delay = 0;
+ 
+-- 
+2.7.4
+