Fix non-aligned subtitle access in the subtitle examiner as well.

diff --git a/src/lib/examine_ffmpeg_subtitles_job.cc b/src/lib/examine_ffmpeg_subtitles_job.cc
index af548b7944529100d2d57e3ec925e85f6255f6e4..b9d5f54e5d09385f21406a52683dd4cfbe60abd7 100644 (file)
--- a/src/lib/examine_ffmpeg_subtitles_job.cc
+++ b/src/lib/examine_ffmpeg_subtitles_job.cc
@@ -82,16 +82,17 @@ ExamineFFmpegSubtitlesJob::run ()
                                                /* sub_p looks up into a BGRA palette which is here
                                                   (i.e. first byte B, second G, third R, fourth A)
                                                */
-                                               uint32_t const * palette = (uint32_t *) rect->pict.data[1];
+                                               uint8_t const * palette = rect->pict.data[1];
 #else
                                                /* sub_p looks up into a BGRA palette which is here
                                                   (i.e. first byte B, second G, third R, fourth A)
                                                */
-                                               uint32_t const * palette = (uint32_t *) rect->data[1];
+                                               uint8_t const * palette = rect->data[1];
 #endif
                                                for (int j = 0; j < rect->nb_colors; ++j) {
-                                                       RGBA c ((palette[j] & 0xff0000) >> 16, (palette[j] & 0xff00) >> 8, palette[j] & 0xff, (palette[j] & 0xff000000) >> 24);
+                                                       RGBA c (palette[2], palette[1], palette[0], palette[3]);
                                                        _content->subtitle_stream()->set_colour (c, c);
+                                                       palette += 4;
                                                }
                                        }
                                }