From d69da18cb07185e9bcaf000fb4162ff912c46e88 Mon Sep 17 00:00:00 2001
From: Benoit Fouet <benoit.fouet@free.fr>
Date: Mon, 2 Mar 2009 09:22:17 +0000
Subject: [PATCH] Merge three conditions in a single 'if' instead of two.
Originally committed as revision 17728 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mpegvideo.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 2af239b6bd7..8dc34883e3c 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;
--
GitLab