codec/avcodec/vaapi_x11.c: surface->i_order is not the display order.

surface->i_order is not the display order, but more the age of the
surface in use.

Conflicts:

	modules/codec/avcodec/vaapi_x11.c

modules/codec/avcodec/vaapi_x11.c

@@ -97,7 +97,6 @@ struct vout_display_sys_t
     xcb_cursor_t cursor; /* blank cursor */
     xcb_window_t window; /* drawable X window */
 
-    unsigned int i_display_order;
     bool visible;  /* whether to draw */
 };
 
@@ -1312,23 +1311,8 @@ static void DisplayPicture(vout_display_t *vd, picture_t *pic, subpicture_t *sub
 
     vlc_va_surface_t *surface = pic->p_sys->surface;
 
-    unsigned int i_order = (sys->i_display_order > 0) ?
-        sys->i_display_order++ : surface->i_order;
-    if ((i_order != surface->i_order) &&
-        (pic->format.i_chroma == VLC_CODEC_VAAPI_SURFACE))
-    {
-        /* Reset picture */
-        msg_Err(vd, "reclaimed picture - id=%d, order=%d, refcount=%d (%p)",
-                surface->i_id, surface->i_order, surface->i_refcount, pic);
-        if (surface->i_refcount > 1)
-            surface->i_refcount = 1;
-
-        goto cleanup;
-    }
-
     DisplayVASurface(vd, surface->i_id, pic);
 
-cleanup:
     if (surface->i_cache != VA_INVALID_ID)
     {
         vlc_mutex_lock(&sys->cache_lock);