[FFmpeg-cvslog] h264/mpegvideo: fix ff_print_debug_info2 arguments

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 11:06:35 2013 +0100| [6ae43725323b02520fa0926422b52d2ce7fd7973] | committer: Michael Niedermayer

h264/mpegvideo: fix ff_print_debug_info2 arguments

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ae43725323b02520fa0926422b52d2ce7fd7973
---

 libavcodec/h264.c      |   10 +++++-----
 libavcodec/mpegvideo.c |    6 ++----
 libavcodec/mpegvideo.h |    2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 0f1c67a..1826ced 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4918,16 +4918,16 @@ not_extra:
             if ((ret = av_frame_ref(pict, &h->next_output_pic->f)) < 0)
                 return ret;
             *got_frame = 1;
+            if (CONFIG_MPEGVIDEO) {
+                ff_print_debug_info2(h->avctx, h->next_output_pic, pict, h->er.mbskip_table,
+                                    h->visualization_buffer, &h->low_delay,
+                                    h->mb_width, h->mb_height, h->mb_stride, 1);
+            }
         }
     }
 
     assert(pict->data[0] || !*got_frame);
 
-    if (CONFIG_MPEGVIDEO) {
-        ff_print_debug_info2(h->avctx, pict, h->er.mbskip_table, h->visualization_buffer, &h->low_delay,
-                             h->mb_width, h->mb_height, h->mb_stride, 1);
-    }
-
     return get_consumed_bytes(buf_index, buf_size);
 }
 
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index d0c8262..b4c3c99 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1913,15 +1913,13 @@ static void draw_arrow(uint8_t *buf, int sx, int sy, int ex,
 /**
  * Print debugging info for the given picture.
  */
-void ff_print_debug_info2(AVCodecContext *avctx, Picture *p, uint8_t *mbskip_table,
+void ff_print_debug_info2(AVCodecContext *avctx, Picture *p, AVFrame *pict, uint8_t *mbskip_table,
                          uint8_t *visualization_buffer[3], int *low_delay,
                          int mb_width, int mb_height, int mb_stride, int quarter_sample)
 {
-    AVFrame *pict;
     if (avctx->hwaccel || !p || !p->mb_type
         || (avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU))
         return;
-    pict = &p->f;
 
 
     if (avctx->debug & (FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE)) {
@@ -2207,7 +2205,7 @@ void ff_print_debug_info2(AVCodecContext *avctx, Picture *p, uint8_t *mbskip_tab
 
 void ff_print_debug_info(MpegEncContext *s, Picture *p)
 {
-    ff_print_debug_info2(s->avctx, p, s->mbskip_table, s->visualization_buffer, &s->low_delay,
+    ff_print_debug_info2(s->avctx, p, &p->f, s->mbskip_table, s->visualization_buffer, &s->low_delay,
                          s->mb_width, s->mb_height, s->mb_stride, s->quarter_sample);
 }
 
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 4bbbac5..2118e52 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -809,7 +809,7 @@ void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h);
 void ff_mpeg_flush(AVCodecContext *avctx);
 
 void ff_print_debug_info(MpegEncContext *s, Picture *p);
-void ff_print_debug_info2(AVCodecContext *avctx, Picture *pict, uint8_t *mbskip_table,
+void ff_print_debug_info2(AVCodecContext *avctx, Picture *p, AVFrame *pict, uint8_t *mbskip_table,
                          uint8_t *visualization_buffer[3], int *low_delay,
                          int mb_width, int mb_height, int mb_stride, int quarter_sample);