aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-07 03:36:46 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-07 03:36:46 +0000
commit046be9299f5ff2131356a6c15475f2cd8cde8536 (patch)
tree6f5b59db09503820c06c671c91bba5912bca82e2 /libavcodec
parent5149048b6f43e345b2e23194ecf7b7dbc3a1158e (diff)
downloadffmpeg-046be9299f5ff2131356a6c15475f2cd8cde8536.tar.gz
Simplify h263_get_picture_format().
Originally committed as revision 21045 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h263.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 807dbc60c6..67a7f18a5b 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -97,21 +97,18 @@ static uint8_t static_rl_table_store[5][2][2*MAX_RUN + MAX_LEVEL + 3];
int h263_get_picture_format(int width, int height)
{
- int format;
-
if (width == 128 && height == 96)
- format = 1;
+ return 1;
else if (width == 176 && height == 144)
- format = 2;
+ return 2;
else if (width == 352 && height == 288)
- format = 3;
+ return 3;
else if (width == 704 && height == 576)
- format = 4;
+ return 4;
else if (width == 1408 && height == 1152)
- format = 5;
+ return 5;
else
- format = 7;
- return format;
+ return 7;
}
static void show_pict_info(MpegEncContext *s){