diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2019-03-15 01:14:58 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2019-03-20 17:16:02 +0100 |
| commit | ba0a56e0b00474eb0e47d503b139816fe28c47e5 (patch) | |
| tree | 549f34e9e0079f1b4552640f2e80ab6c2e70c585 /libavcodec | |
| parent | 6fcf7adc019b29926ce7b096640cfdf714074bcd (diff) | |
lavc/qtrle: Avoid an unaligned 64-bit write.
pixel_ptr can be increased by 4.
Fixes a crash on sparc64.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qtrle.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 1cb3eb05bd..1613530e02 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -388,7 +388,7 @@ static void qtrle_decode_32bpp(QtrleContext *s, int row_ptr, int lines_to_change /* copy pixels directly to output */ rle_code_half = rle_code / 2; while (rle_code_half--) { /* copy 2 argb raw value at the same time */ - AV_WN64A(rgb + pixel_ptr, bytestream2_get_ne64(&s->g)); + AV_WN64(rgb + pixel_ptr, bytestream2_get_ne64(&s->g)); pixel_ptr += 8; } diff --git a/libavcodec/version.h b/libavcodec/version.h index a217283b03..348b4d0300 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 47 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MICRO 105 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |