projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b00b15b
)
Merge three conditions in a single 'if' instead of two.
author
Benoit Fouet
<benoit.fouet@free.fr>
Mon, 2 Mar 2009 09:22:17 +0000
(09:22 +0000)
committer
Benoit Fouet
<benoit.fouet@free.fr>
Mon, 2 Mar 2009 09:22:17 +0000
(09:22 +0000)
Originally committed as revision 17728 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mpegvideo.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo.c
b/libavcodec/mpegvideo.c
index
2af239b
..
8dc3488
100644
(file)
--- 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;