jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: update upstream patches

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-05-18 16:15:59 +02:00
parent cfee1d5a3c
commit e3aa2d3923
3 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/multimedia/ffmpeg/patches/1.2/ffmpeg-901.07-register_vdpau_hwaccel_for_mpeg12.patch → packages/multimedia/ffmpeg/patches/1.2/ffmpeg-901.07.0036-backport-register-vdpau-hwaccel-for-mpeg12-fe1f36547d0be963e352de0cde1a6cba59ea2e78.patch vendored
View File

@ -1,17 +1,17 @@
From f7bb0fe1f6336ce3d5263680f2985fd0cedb719d Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 1 May 2013 18:43:56 +0200
Subject: [PATCH] ffmpeg: register vdpau hwaccel for mpeg12
From bb6ba57092c402b6f2e5edf6d1691beafafa0460 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 6 May 2013 20:58:28 +0200
Subject: [PATCH] ffmpeg backport: register vdpau hwaccel for mpeg12
---
libavcodec/mpeg12.c | 2 ++
libavcodec/mpeg12.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 9d2743a..0f94772 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1202,6 +1202,7 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
@@ -1202,6 +1202,7 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
#endif
#if CONFIG_MPEG1_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU_MPEG1,
@ -19,7 +19,7 @@ index 9d2743a..0f94772 100644
#endif
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
@@ -1214,6 +1215,7 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
@@ -1214,6 +1215,7 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
#endif
#if CONFIG_MPEG2_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU_MPEG2,
@ -28,5 +28,5 @@ index 9d2743a..0f94772 100644
#if CONFIG_MPEG2_DXVA2_HWACCEL
AV_PIX_FMT_DXVA2_VLD,
--
1.8.1.6
1.7.9.5

25
packages/multimedia/ffmpeg/patches/1.2/ffmpeg-901.07.0037-backport-fix-vdpau-vc1-interlace-modes-b37cc5995b88ec68a68cb8e496a008e1cd467077.patch vendored Normal file
View File

@ -0,0 +1,25 @@
From b37cc5995b88ec68a68cb8e496a008e1cd467077 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sun, 5 May 2013 15:12:59 +0200
Subject: [PATCH] fix vdpau vc1 interlace modes
---
libavcodec/vdpau_vc1.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c
index f5da9bb..993ef26 100644
--- a/libavcodec/vdpau_vc1.c
+++ b/libavcodec/vdpau_vc1.c
@@ -59,7 +59,7 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx,
else
info->picture_type = s->pict_type - 1 + s->pict_type / 3;
- info->frame_coding_mode = v->fcm;
+ info->frame_coding_mode = v->fcm ? v->fcm + 1 : 0;
info->postprocflag = v->postprocflag;
info->pulldown = v->broadcast;
info->interlace = v->interlace;
--
1.7.9.5

30
packages/multimedia/ffmpeg/patches/1.2/ffmpeg-901.08-fix_vdpau_vc1_field_interlace.patch vendored
View File

@ -1,30 +0,0 @@
From 7c305a6fc9cd41a5eddf28cfbfc33bb98459c29e Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 2 May 2013 19:29:05 +0200
Subject: [PATCH] ffmpeg: fix vdpau vc1 field interlace
---
libavcodec/vdpau_vc1.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c
index f5da9bb..6831599 100644
--- a/libavcodec/vdpau_vc1.c
+++ b/libavcodec/vdpau_vc1.c
@@ -59,7 +59,12 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx,
else
info->picture_type = s->pict_type - 1 + s->pict_type / 3;
- info->frame_coding_mode = v->fcm;
+ if (v->fcm == PROGRESSIVE)
+ info->frame_coding_mode = 0;
+ else if (v->fcm == ILACE_FRAME)
+ info->frame_coding_mode = 2;
+ else if (v->fcm == ILACE_FIELD)
+ info->frame_coding_mode = 3;
info->postprocflag = v->postprocflag;
info->pulldown = v->broadcast;
info->interlace = v->interlace;
--
1.8.1.6