highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/h264: Fix undefined shifts in pack16to32() and pack8to16()

Browse Source 
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-10 21:15:05 +01:00
parent 111456682f
commit eb7960b2bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.h
View File

@ -949,7 +949,7 @@ static const uint8_t scan8[16 * 3 + 3] = {
0 + 0 * 8, 0 + 5 * 8, 0 + 10 * 8 0 + 0 * 8, 0 + 5 * 8, 0 + 10 * 8
}; };
static av_always_inline uint32_t pack16to32(int a, int b) static av_always_inline uint32_t pack16to32(unsigned a, unsigned b)
{ {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
return (b & 0xFFFF) + (a << 16); return (b & 0xFFFF) + (a << 16);
@ -958,7 +958,7 @@ static av_always_inline uint32_t pack16to32(int a, int b)
#endif #endif
} }
static av_always_inline uint16_t pack8to16(int a, int b) static av_always_inline uint16_t pack8to16(unsigned a, unsigned b)
{ {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
return (b & 0xFF) + (a << 8); return (b & 0xFF) + (a << 8);