diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-30 02:12:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-30 02:12:53 +0100 |
| commit | 4aa9c91508203fdcaa687abff2d8d4ae46d4cde6 (patch) | |
| tree | 720510e61e5045d8775eff5219c8e82799ebd029 /libavcodec | |
| parent | e80aa47abf74b9dda336d3e156fb49402093ec44 (diff) | |
| parent | de40905f55cdd668b50a143f8e30936d22a09a37 (diff) | |
| download | ffmpeg-4aa9c91508203fdcaa687abff2d8d4ae46d4cde6.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix condition for transparency warning in xsub encoder.
Allow hiding the banner.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/xsubenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c index 53f4d6c3a9..707085488c 100644 --- a/libavcodec/xsubenc.c +++ b/libavcodec/xsubenc.c @@ -142,7 +142,7 @@ static int xsub_encode(AVCodecContext *avctx, unsigned char *buf, av_log(avctx, AV_LOG_WARNING, "No more than 4 subtitle colors supported (%d found.)\n", h->rects[0]->nb_colors); // TODO: Palette swapping if color zero is not transparent - if (((uint32_t *)h->rects[0]->pict.data[1])[0] & 0xff) + if (((uint32_t *)h->rects[0]->pict.data[1])[0] & 0xff000000) av_log(avctx, AV_LOG_WARNING, "Color index 0 is not transparent. Transparency will be messed up.\n"); if (make_tc(startTime, start_tc) || make_tc(endTime, end_tc)) { |