From 091bc6ca8c643bfece2c70ff2404c7b31574e1f1 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Mon, 10 Jan 2011 12:16:33 +0000 Subject: mmvideo: remove some conditional statements by limiting range of half_horiz and half_vert parameters to [0,1] Originally committed as revision 26299 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mmvideo.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'libavcodec/mmvideo.c') diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 6dbc0c4494..0b20ab4d1d 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -78,6 +78,10 @@ static void mm_decode_pal(MmContext *s, const uint8_t *buf, const uint8_t *buf_e } } +/** + * @param half_horiz Half horizontal resolution (0 or 1) + * @param half_vert Half vertical resolution (0 or 1) + */ static void mm_decode_intra(MmContext * s, int half_horiz, int half_vert, const uint8_t *buf, int buf_size) { int i, x, y; @@ -108,11 +112,15 @@ static void mm_decode_intra(MmContext * s, int half_horiz, int half_vert, const if (x >= s->avctx->width) { x=0; - y += half_vert ? 2 : 1; + y += 1 + half_vert; } } } +/* + * @param half_horiz Half horizontal resolution (0 or 1) + * @param half_vert Half vertical resolution (0 or 1) + */ static void mm_decode_inter(MmContext * s, int half_horiz, int half_vert, const uint8_t *buf, int buf_size) { const int data_ptr = 2 + AV_RL16(&buf[0]); @@ -145,12 +153,12 @@ static void mm_decode_inter(MmContext * s, int half_horiz, int half_vert, const } d++; } - x += half_horiz ? 2 : 1; + x += 1 + half_horiz; } } r += length; - y += half_vert ? 2 : 1; + y += 1 + half_vert; } } -- cgit v1.2.3