eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-18 04:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename PACK4x8() to PACK4UINT8().

Browse Source 
Originally committed as revision 23721 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje
2010-06-22 20:57:00 +00:00
parent fd6eb4a06c
commit 157cb0694a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264pred.c
View File

@@ -109,7 +109,7 @@ static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright, int st
const int lt= src[-1-1*stride]; const int lt= src[-1-1*stride];
LOAD_TOP_EDGE LOAD_TOP_EDGE
LOAD_TOP_RIGHT_EDGE LOAD_TOP_RIGHT_EDGE
uint32_t v = PACK4x8((lt + 2*t0 + t1 + 2) >> 2, uint32_t v = PACK4UINT8((lt + 2*t0 + t1 + 2) >> 2,
(t0 + 2*t1 + t2 + 2) >> 2, (t0 + 2*t1 + t2 + 2) >> 2,
(t1 + 2*t2 + t3 + 2) >> 2, (t1 + 2*t2 + t3 + 2) >> 2,
(t2 + 2*t3 + t4 + 2) >> 2); (t2 + 2*t3 + t4 + 2) >> 2);

4
libavcodec/mathops.h
View File

@@ -148,9 +148,9 @@ if ((y) < (x)) {\
#ifndef PACK4x8 #ifndef PACK4x8
# if HAVE_BIGENDIAN # if HAVE_BIGENDIAN
# define PACK4x8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) # define PACK4UINT8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
# else # else
# define PACK4x8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) # define PACK4UINT8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a))
# endif # endif
#endif #endif