[FFmpeg-cvslog] r19512 - in trunk/libavcodec: dvdsubdec.c xsubdec.c

[stefano]

Author: stefano
Date: Mon Jul 27 01:08:04 2009
New Revision: 19512

Log:
Set subtitle type in DVD and XSUB subtitle decoders.

Patch by Janne Grunau <ja?ne-f?mpeg jannau net>.

Modified:
   trunk/libavcodec/dvdsubdec.c
   trunk/libavcodec/xsubdec.c

Modified: trunk/libavcodec/dvdsubdec.c
==============================================================================
--- trunk/libavcodec/dvdsubdec.c	Sun Jul 26 23:22:57 2009	(r19511)
+++ trunk/libavcodec/dvdsubdec.c	Mon Jul 27 01:08:04 2009	(r19512)
@@ -353,6 +353,7 @@ static int decode_dvd_subtitles(AVSubtit
                 sub_header->rects[0]->y = y1;
                 sub_header->rects[0]->w = w;
                 sub_header->rects[0]->h = h;
+                sub_header->rects[0]->type = SUBTITLE_BITMAP;
                 sub_header->rects[0]->pict.linesize[0] = w;
             }
         }

Modified: trunk/libavcodec/xsubdec.c
==============================================================================
--- trunk/libavcodec/xsubdec.c	Sun Jul 26 23:22:57 2009	(r19511)
+++ trunk/libavcodec/xsubdec.c	Mon Jul 27 01:08:04 2009	(r19512)
@@ -91,6 +91,7 @@ static int decode_frame(AVCodecContext *
     av_freep(&sub->rects[0]->pict.data[0]);
     sub->rects[0]->x = x; sub->rects[0]->y = y;
     sub->rects[0]->w = w; sub->rects[0]->h = h;
+    sub->rects[0]->type = SUBTITLE_BITMAP;
     sub->rects[0]->pict.linesize[0] = w;
     sub->rects[0]->pict.data[0] = av_malloc(w * h);
     sub->rects[0]->nb_colors = 4;