Index: libavcodec/vdpau.c
===================================================================
--- libavcodec/vdpau.c	(revision 19580)
+++ libavcodec/vdpau.c	(arbetskopia)
@@ -176,7 +176,7 @@
     memcpy(render->info.h264.scaling_lists_8x8, h->pps.scaling_matrix8, sizeof(render->info.h264.scaling_lists_8x8));
 
     ff_draw_horiz_band(s, 0, s->avctx->height);
-    render->bitstream_buffers_used = 0;
+    render->bitstream_buffers_used = 0;  
 }
 
 void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
Index: libavcodec/mpegvideo.c
===================================================================
--- libavcodec/mpegvideo.c	(revision 19580)
+++ libavcodec/mpegvideo.c	(arbetskopia)
@@ -2008,12 +2008,7 @@
 
         h= FFMIN(h, s->avctx->height - y);
 
-        if(s->pict_type==FF_B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER))
-            src= (AVFrame*)s->current_picture_ptr;
-        else if(s->last_picture_ptr)
-            src= (AVFrame*)s->last_picture_ptr;
-        else
-            return;
+	  	src = (AVFrame*)s->current_picture_ptr;
 
         if(s->pict_type==FF_B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){
             offset[0]=
