# HG changeset patch # User michael # Date 1262876111 0 # Node ID 9b3ec3d1bdae07f004009bb4b556e4171689a0c2 # Parent 13c67390a84636dc133c6de70096423920bc482d Factorize if() surrounding every ff_h263_show_pict_info() call. diff -r 13c67390a846 -r 9b3ec3d1bdae h263.c --- a/h263.c Thu Jan 07 06:32:34 2010 +0000 +++ b/h263.c Thu Jan 07 14:55:11 2010 +0000 @@ -134,6 +134,7 @@ } void ff_h263_show_pict_info(MpegEncContext *s){ + if(s->avctx->debug&FF_DEBUG_PICT_INFO){ av_log(s->avctx, AV_LOG_DEBUG, "qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s%s %d/%d\n", s->qscale, av_get_pict_type_char(s->pict_type), s->gb.size_in_bits, 1-s->no_rounding, @@ -148,6 +149,7 @@ s->h263_slice_structured ? " SS" : "", s->avctx->time_base.den, s->avctx->time_base.num ); + } } #if CONFIG_ENCODERS @@ -5358,9 +5360,7 @@ s->c_dc_scale_table= ff_mpeg1_dc_scale_table; } - if(s->avctx->debug&FF_DEBUG_PICT_INFO){ ff_h263_show_pict_info(s); - } if (s->pict_type == FF_I_TYPE && s->codec_tag == AV_RL32("ZYGO")){ int i,j; for(i=0; i<85; i++) av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb)); diff -r 13c67390a846 -r 9b3ec3d1bdae intelh263dec.c --- a/intelh263dec.c Thu Jan 07 06:32:34 2010 +0000 +++ b/intelh263dec.c Thu Jan 07 14:55:11 2010 +0000 @@ -109,7 +109,6 @@ s->y_dc_scale_table= s->c_dc_scale_table= ff_mpeg1_dc_scale_table; - if(s->avctx->debug&FF_DEBUG_PICT_INFO) ff_h263_show_pict_info(s); return 0;