diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-07 14:55:11 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-07 14:55:11 +0000 |
| commit | 4fea04820b2d476d467a4f596bbd50b281b6c4e5 (patch) | |
| tree | 3fa0da04b91d69b5f5099ee19ee7bb2e91320739 | |
| parent | 9ea7f03aa08151d8e490d83d3fff3f9d5f1a3b3b (diff) | |
| download | ffmpeg-4fea04820b2d476d467a4f596bbd50b281b6c4e5.tar.gz | |
Factorize if() surrounding every ff_h263_show_pict_info() call.
Originally committed as revision 21058 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.c | 4 | ||||
| -rw-r--r-- | libavcodec/intelh263dec.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 0065dbebdc..c73893986e 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -134,6 +134,7 @@ int h263_get_picture_format(int width, int height) } 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 @@ void ff_h263_show_pict_info(MpegEncContext *s){ s->h263_slice_structured ? " SS" : "", s->avctx->time_base.den, s->avctx->time_base.num ); + } } #if CONFIG_ENCODERS @@ -5358,9 +5360,7 @@ int h263_decode_picture_header(MpegEncContext *s) 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 --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 4a0078b8c4..08defb37fb 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -109,7 +109,6 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) 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; |