aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2009-03-02 09:22:17 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2009-03-02 09:22:17 +0000
commitd69da18cb07185e9bcaf000fb4162ff912c46e88 (patch)
treea787ad0df4edc5ccf31cb2b0b3d50a4a6e9186bc /libavcodec
parentb00b15be033888fa6b5eac4e4a6da683ff58b54d (diff)
downloadffmpeg-d69da18cb07185e9bcaf000fb4162ff912c46e88.tar.gz
Merge three conditions in a single 'if' instead of two.
Originally committed as revision 17728 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegvideo.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 2af239b6bd..8dc34883e3 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1096,8 +1096,7 @@ static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int
*/
void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
- if(s->avctx->hwaccel) return;
- if(!pict || !pict->mb_type) return;
+ if(s->avctx->hwaccel || !pict || !pict->mb_type) return;
if(s->avctx->debug&(FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE)){
int x,y;