[x264-devel] commit: Cosmetics in me.c and frame.c (Jason Garrett-Glaser )
git at videolan.org
git at videolan.org
Sun Sep 19 17:21:41 CEST 2010
x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sun Sep 19 00:25:27 2010 -0700| [e757d68b1a7f75de97cc472206cae52b770eeefb] | committer: Jason Garrett-Glaser
Cosmetics in me.c and frame.c
> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=e757d68b1a7f75de97cc472206cae52b770eeefb
---
common/frame.c | 13 ++++++++-----
encoder/me.c | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/common/frame.c b/common/frame.c
index ae5a01f..0c3d77f 100644
--- a/common/frame.c
+++ b/common/frame.c
@@ -295,15 +295,18 @@ int x264_frame_copy_picture( x264_t *h, x264_frame_t *dst, x264_picture_t *src )
static void ALWAYS_INLINE pixel_memset( pixel *dst, pixel *src, int len, int size )
{
uint8_t *dstp = (uint8_t*)dst;
- if(size == 1) {
+ if( size == 1 )
memset(dst, *src, len);
- } else if(size == 2) {
+ else if( size == 2 )
+ {
int v = M16( src );
- for(int i=0; i<len; i++)
+ for( int i = 0; i < len; i++ )
M16( dstp+i*2 ) = v;
- } else if(size == 4) {
+ }
+ else if( size == 4 )
+ {
int v = M32( src );
- for(int i=0; i<len; i++)
+ for( int i = 0; i < len; i++ )
M32( dstp+i*4 ) = v;
}
}
diff --git a/encoder/me.c b/encoder/me.c
index ea98955..89d7ee1 100644
--- a/encoder/me.c
+++ b/encoder/me.c
@@ -299,7 +299,7 @@ void x264_me_search_ref( x264_t *h, x264_me_t *m, int16_t (*mvc)[2], int i_mvc,
}
case X264_ME_HEX:
- {
+ {
me_hex2:
/* hexagon search, radius 2 */
#if 0
More information about the x264-devel
mailing list