summaryrefslogtreecommitdiff
path: root/libavcodec/dvdsubdec.c
diff options
context:
space:
mode:
authorAlexandre Colucci <alexandre@elgato.com>2011-03-25 11:25:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-25 19:00:54 +0100
commit9743e909f113b2f7b09e4879871e3b8e66d32204 (patch)
treefc60e34b7162b7284076f0bc75d900f192d6cc31 /libavcodec/dvdsubdec.c
parent10a7831aa182d841cfabb8b578fd31e6fd334310 (diff)
Fix incorrect colors when decoding DVD subtitles
On DVD and HD-DVD colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications: see DVD Specifications for Read-Only Disc / Part 3, 4.3 Program Chain Information (7) PGC_SP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (11) PGC_SDSP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (12) PGC_HDSP_PLT see DVD Specifications for High Definition Disc, 5.5 Presentation Data (4) SET_COLOR2 When decoding a DVD or HD-DVD subtitle, the colors were incorrectly set.
Diffstat (limited to 'libavcodec/dvdsubdec.c')
-rw-r--r--libavcodec/dvdsubdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index bea2646dfe..507c1813ff 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -34,8 +34,8 @@ static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *
for (i = num_values; i > 0; i--) {
y = *ycbcr++;
- cb = *ycbcr++;
cr = *ycbcr++;
+ cb = *ycbcr++;
YUV_TO_RGB1_CCIR(cb, cr);
YUV_TO_RGB2_CCIR(r, g, b, y);
*rgba++ = (*alpha++ << 24) | (r << 16) | (g << 8) | b;