[FFmpeg-cvslog] Merge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 11:26:20 2017 +0100| [554cc43ac6c31d06c85d6395afe96b796ef29150] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=554cc43ac6c31d06c85d6395afe96b796ef29150
---

 libavformat/avidec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index e2527a1..a7e9ab1 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;
                     }
 


======================================================================

diff --cc libavformat/avidec.c
index e2527a1,b2457d5..a7e9ab1
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@@ -794,12 -652,8 +794,12 @@@ FF_ENABLE_DEPRECATION_WARNING
                          pal_size = FFMIN(pal_size, st->codecpar->extradata_size);
                          pal_src  = st->codecpar->extradata +
                                     st->codecpar->extradata_size - pal_size;
 +                        /* Exclude the "BottomUp" field from the palette */
 +                        if (pal_src - st->codecpar->extradata >= 9 &&
 +                            !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] = AV_RL32(pal_src + 4 * i);
++                            ast->pal[i] = 0xFFU<<24 | AV_RL32(pal_src + 4 * i);
                          ast->has_pal = 1;
                      }