diff options
author | Clément Bœsch | 2017-03-23 11:26:20 +0100 |
---|---|---|
committer | Clément Bœsch | 2017-03-23 11:26:32 +0100 |
commit | 554cc43ac6c31d06c85d6395afe96b796ef29150 (patch) | |
tree | e0c8029769e1926b8791d436eb3b3875d3917bac | |
parent | a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e (diff) | |
parent | bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4 (diff) |
Merge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'
* commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4':
avidec: Do not special case palette on big-endian
This commit is a noop, see 64cafe340bd5ddfe704efa95cd9f21471ca12a12
Merged-by: Clément Bœsch <u@pkh.me>
-rw-r--r-- | libavformat/avidec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index e2527a1e31..a7e9ab15f5 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -799,7 +799,7 @@ FF_ENABLE_DEPRECATION_WARNINGS !memcmp(st->codecpar->extradata + st->codecpar->extradata_size - 9, "BottomUp", 9)) pal_src -= 9; for (i = 0; i < pal_size / 4; i++) - ast->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i); + ast->pal[i] = 0xFFU<<24 | AV_RL32(pal_src + 4 * i); ast->has_pal = 1; } |