leigh123linux
7 years ago
parent
edf5fc3384
commit
258d4c202f
@ -1,2 +1,3 @@
|
||||
Blue-1.11.tar.bz2
|
||||
MPlayer-1.3.0.tar.xz
|
||||
/mplayer-export-2018-01-19.tar.bz2
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
From 2fe876f5ed67edd72e6da4fd0ccaae03a1952d4c Mon Sep 17 00:00:00 2001
|
||||
From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2>
|
||||
Date: Wed, 19 Apr 2017 23:06:04 +0000
|
||||
Subject: [PATCH] vo_vdpau: Explicitly include header vdpau_x11.h
|
||||
|
||||
The include from inside libavcodec/vdpau.h was removed in FFmpeg
|
||||
commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
|
||||
---
|
||||
libvo/vo_vdpau.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
|
||||
index 7b94cad1b9..99f08d6c7b 100644
|
||||
--- a/libvo/vo_vdpau.c
|
||||
+++ b/libvo/vo_vdpau.c
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <strings.h>
|
||||
+#include <vdpau/vdpau_x11.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "sub/ass_mp.h"
|
||||
@ -1,26 +0,0 @@
|
||||
From bbaf524d691d6bfecfd65175259fd61abc6e5f69 Mon Sep 17 00:00:00 2001
|
||||
From: rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>
|
||||
Date: Sun, 3 Jul 2016 20:06:11 +0000
|
||||
Subject: [PATCH] Fix crash with screenshot filter.
|
||||
|
||||
avcodec_open2() now requires timebase to be always set, even for png images.
|
||||
The patch sets it to 1/1, since pictures do not have a framerate.
|
||||
|
||||
Patch by Thomas Kirsten (Tho_Ki gmx de)
|
||||
---
|
||||
libmpcodecs/vf_screenshot.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c
|
||||
index 4692d20..992ea6d 100644
|
||||
--- a/libmpcodecs/vf_screenshot.c
|
||||
+++ b/libmpcodecs/vf_screenshot.c
|
||||
@@ -81,6 +81,8 @@ static int config(struct vf_instance *vf,
|
||||
vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24;
|
||||
vf->priv->avctx->width = d_width;
|
||||
vf->priv->avctx->height = d_height;
|
||||
+ vf->priv->avctx->time_base.num = 1;
|
||||
+ vf->priv->avctx->time_base.den = 1;
|
||||
vf->priv->avctx->compression_level = 0;
|
||||
if (avcodec_open2(vf->priv->avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL)) {
|
||||
mp_msg(MSGT_VFILTER, MSGL_FATAL, "Could not open libavcodec PNG encoder\n");
|
||||
@ -1,24 +0,0 @@
|
||||
From 3e7a0f39e5acf4e9da96cb075050e51e24e81403 Mon Sep 17 00:00:00 2001
|
||||
From: rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>
|
||||
Date: Sun, 7 Aug 2016 20:44:47 +0000
|
||||
Subject: [PATCH] Fix vo_png with recent ffmpeg
|
||||
|
||||
avcodec_open2() now requires timebase to be always set, even for png images.
|
||||
The patch sets it to 1/1, since pictures do not have a framerate.
|
||||
---
|
||||
libvo/vo_png.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libvo/vo_png.c b/libvo/vo_png.c
|
||||
index 38a4097..5696a1f 100644
|
||||
--- a/libvo/vo_png.c
|
||||
+++ b/libvo/vo_png.c
|
||||
@@ -136,6 +136,8 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
|
||||
avctx->pix_fmt = imgfmt2pixfmt(format);
|
||||
avctx->width = width;
|
||||
avctx->height = height;
|
||||
+ avctx->time_base.num = 1;
|
||||
+ avctx->time_base.den = 1;
|
||||
if (avcodec_open2(avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL) < 0) {
|
||||
uninit();
|
||||
return -1;
|
||||
Loading…
Reference in new issue