[SCM] mplayer/master: Fix crash with the screenshot filter

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4e39cc77c0001af92d26d0ca76101133a46fe792
Author: James Cowgill <jcowgill at debian.org>
Date:   Wed Dec 14 21:03:59 2016 +0000

    Fix crash with the screenshot filter
    
    Closes: #834135

diff --git a/debian/patches/0101_svn37875_fix-crash-with-screenshot-filter.patch b/debian/patches/0101_svn37875_fix-crash-with-screenshot-filter.patch
new file mode 100644
index 0000000..a29ce4c
--- /dev/null
+++ b/debian/patches/0101_svn37875_fix-crash-with-screenshot-filter.patch
@@ -0,0 +1,22 @@
+Description: 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.
+Author: Thomas Kirsten <Tho_Ki at gmx.de>
+Origin:
+ http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-June/073497.html
+Bug-Debian: https://bugs.debian.org/834135
+Applied-Upstream: commit:37875
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- 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");
diff --git a/debian/patches/series b/debian/patches/series
index 0ad6c4e..43264b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 0001_version.patch
 0002_mplayer_debug_printf.patch
 0100_svn37857_CVE-2016-4352.patch
+0101_svn37875_fix-crash-with-screenshot-filter.patch
 0200_fix_spelling_error_in_binary.patch
 0201_PATH_MAX_HURD.patch

-- 
mplayer packaging