Commit 47e88adc authored by John Stebbins's avatar John Stebbins Committed by Philip Langdale

lavc/movtextdec: fix ass header colors

A conversion from rgb to bgr is necessary
Signed-off-by: 's avatarPhilip Langdale <philipl@overt.org>
parent c3a2615b
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
#define TOP_CENTER 8 #define TOP_CENTER 8
#define TOP_RIGHT 9 #define TOP_RIGHT 9
#define RGB_TO_BGR(c) (((c) & 0xff) << 16 | ((c) & 0xff00) | (((c) >> 16) & 0xff))
typedef struct { typedef struct {
char *font; char *font;
int fontsize; int fontsize;
...@@ -448,10 +450,11 @@ static int mov_text_init(AVCodecContext *avctx) { ...@@ -448,10 +450,11 @@ static int mov_text_init(AVCodecContext *avctx) {
MovTextContext *m = avctx->priv_data; MovTextContext *m = avctx->priv_data;
ret = mov_text_tx3g(avctx, m); ret = mov_text_tx3g(avctx, m);
if (ret == 0) { if (ret == 0) {
return ff_ass_subtitle_header(avctx, m->d.font, m->d.fontsize, m->d.color, return ff_ass_subtitle_header(avctx, m->d.font, m->d.fontsize,
m->d.back_color, m->d.bold, m->d.italic, RGB_TO_BGR(m->d.color),
m->d.underline, ASS_DEFAULT_BORDERSTYLE, RGB_TO_BGR(m->d.back_color),
m->d.alignment); m->d.bold, m->d.italic, m->d.underline,
ASS_DEFAULT_BORDERSTYLE, m->d.alignment);
} else } else
return ff_ass_subtitle_header_default(avctx); return ff_ass_subtitle_header_default(avctx);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment