[SCM] libav/experimental: Simplify h263_get_picture_format().
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:56:50 UTC 2013
The following commit has been merged in the experimental branch:
commit 046be9299f5ff2131356a6c15475f2cd8cde8536
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Jan 7 03:36:46 2010 +0000
Simplify h263_get_picture_format().
Originally committed as revision 21045 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 807dbc6..67a7f18 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){
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list