# HG changeset patch
# User michaelni
# Date 1056718720 0
# Node ID ca3122e0a3cd16d39093bb8e79e16c8430b41a85
# Parent  854571532c898780aa0e970662d3b0d66f1a2a49
2x100l

diff -r 854571532c89 -r ca3122e0a3cd mpeg12.c
--- a/mpeg12.c	Thu Jun 26 11:31:34 2003 +0000
+++ b/mpeg12.c	Fri Jun 27 12:58:40 2003 +0000
@@ -2023,14 +2023,14 @@
         MPV_frame_end(s);
 
         if (s->pict_type == B_TYPE || s->low_delay) {
-            *pict= *(AVFrame*)&s->current_picture;
+            *pict= *(AVFrame*)s->current_picture_ptr;
             ff_print_debug_info(s, s->current_picture_ptr);
         } else {
             s->picture_number++;
             /* latency of 1 frame for I and P frames */
             /* XXX: use another variable than picture_number */
             if (s->last_picture_ptr != NULL) {
-                *pict= *(AVFrame*)&s->last_picture;
+                *pict= *(AVFrame*)s->last_picture_ptr;
                  ff_print_debug_info(s, s->last_picture_ptr);
             }
         }
diff -r 854571532c89 -r ca3122e0a3cd mpegvideo.c
--- a/mpegvideo.c	Thu Jun 26 11:31:34 2003 +0000
+++ b/mpegvideo.c	Fri Jun 27 12:58:40 2003 +0000
@@ -1025,7 +1025,7 @@
 {
     int i;
     /* draw edge for correct motion prediction if outside */
-    if(s->codec_id!=CODEC_ID_SVQ1){
+    if(s->codec_id!=CODEC_ID_SVQ1 && s->codec_id != CODEC_ID_MPEG1VIDEO){
         if (s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
             draw_edges(s->current_picture.data[0], s->linesize  , s->h_edge_pos   , s->v_edge_pos   , EDGE_WIDTH  );
             draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);