summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-24 21:47:56 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-24 21:47:56 +0000
commitc266ad4de429e31a92b98e3ef31661d09802f8a8 (patch)
tree043fa991402943bcb4c7561cda2366f0c7297af5
parent7ab8e44842d312a82fa0039bfb0242ebb227d104 (diff)
downloadmpv-c266ad4de429e31a92b98e3ef31661d09802f8a8.tar.bz2
mpv-c266ad4de429e31a92b98e3ef31661d09802f8a8.tar.xz
New vdpau deinterlacing code needs one reference surface less.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29052 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_vdpau.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 8ef93523ea..a527f16dfd 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -148,7 +148,7 @@ static void *vdpau_lib_handle;
#define osd_surface output_surfaces[NUM_OUTPUT_SURFACES]
static VdpOutputSurface output_surfaces[NUM_OUTPUT_SURFACES + 1];
static VdpVideoSurface deint_surfaces[3];
-static mp_image_t *deint_mpi[3];
+static mp_image_t *deint_mpi[2];
static int output_surface_width, output_surface_height;
static VdpVideoMixer video_mixer;
@@ -466,7 +466,7 @@ static void free_video_specific(void) {
for (i = 0; i < 3; i++)
deint_surfaces[i] = VDP_INVALID_HANDLE;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < 2; i++)
if (deint_mpi[i]) {
deint_mpi[i]->usage_count--;
deint_mpi[i] = NULL;
@@ -872,9 +872,8 @@ static uint32_t draw_image(mp_image_t *mpi)
vid_surface_num = rndr - surface_render;
if (deint_buffer_past_frames) {
mpi->usage_count++;
- if (deint_mpi[2])
- deint_mpi[2]->usage_count--;
- deint_mpi[2] = deint_mpi[1];
+ if (deint_mpi[1])
+ deint_mpi[1]->usage_count--;
deint_mpi[1] = deint_mpi[0];
deint_mpi[0] = mpi;
}
@@ -1035,7 +1034,7 @@ static int preinit(const char *arg)
deint_type = 3;
deint_counter = 0;
deint_buffer_past_frames = 0;
- deint_mpi[0] = deint_mpi[1] = deint_mpi[2] = NULL;
+ deint_mpi[0] = deint_mpi[1] = NULL;
chroma_deint = 1;
pullup = 0;
denoise = 0;