diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 21:15:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 21:25:39 +0100 |
| commit | eb7960b2bd36c9a3a2c00d5cf57ee6bcaacd02c1 (patch) | |
| tree | 01c4d4630b6a9c82f0b456c72b570b5e2925c53f /libavcodec/h264.h | |
| parent | 111456682f555577747de2d81901cf07b0e717b5 (diff) | |
| download | ffmpeg-eb7960b2bd36c9a3a2c00d5cf57ee6bcaacd02c1.tar.gz | |
avcodec/h264: Fix undefined shifts in pack16to32() and pack8to16()
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 21e9952720..8496f0bcc1 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -949,7 +949,7 @@ static const uint8_t scan8[16 * 3 + 3] = { 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 return (b & 0xFFFF) + (a << 16); @@ -958,7 +958,7 @@ static av_always_inline uint32_t pack16to32(int a, int b) #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 return (b & 0xFF) + (a << 8); |