Merge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:26:20 +0000 (11:26 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:26:32 +0000 (11:26 +0100)
* 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>
libavformat/avidec.c

index e2527a1..a7e9ab1 100644 (file)
@@ -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;
                     }