summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2012-08-06 18:26:02 +0000
committerwm4 <wm4@nowhere>2012-10-30 19:50:17 +0100
commitceca8f67578c4154cc3faea5127d53009deb6316 (patch)
tree8b658d8049ebc9177f1a665e2c8eb78451dede6a
parent7470b02ef4cd7a2eb2e0d13971d003067fd99025 (diff)
downloadmpv-ceca8f67578c4154cc3faea5127d53009deb6316.tar.bz2
mpv-ceca8f67578c4154cc3faea5127d53009deb6316.tar.xz
vf_expand: remove outdated code causing crashes
Remove outdated code that instead of preventing now causes crashes. The problem it was trying to catch (next filter not supporting slices) was fixed already in r10141 (by implementing a fallback version of vf_next_draw_slice). This should fix Debian Bug#683907. Example command-line: mencoder big_buck_bunny_480p_stereo.avi -o a.mpg -vf crop=346:240:2:24 -oac copy -ovc lavc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35061 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Conflicts: libmpcodecs/vf_expand.c
-rw-r--r--libmpcodecs/vf_expand.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index ff13a8501e..839820510d 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -171,10 +171,6 @@ static void get_image(struct vf_instance *vf, mp_image_t *mpi){
static void start_slice(struct vf_instance *vf, mp_image_t *mpi){
// printf("start_slice called! flag=%d\n",mpi->flags&MP_IMGFLAG_DRAW_CALLBACK);
- if(!vf->next->draw_slice){
- mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;
- return;
- }
// they want slices!!! allocate the buffer.
if(!mpi->priv)
mpi->priv=vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
@@ -182,8 +178,6 @@ static void start_slice(struct vf_instance *vf, mp_image_t *mpi){
MP_IMGTYPE_TEMP, mpi->flags,
FFMAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
FFMAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
- if(!(vf->dmpi->flags&MP_IMGFLAG_DRAW_CALLBACK))
- mp_tmsg(MSGT_VFILTER, MSGL_WARN, "WARNING! Next filter doesn't support SLICES, get ready for sig11...\n"); // shouldn't happen.
vf->priv->first_slice = 1;
}