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

[diego]

Author: diego
Date: Thu Feb 12 02:27:56 2009
New Revision: 17170

Log:
Set AVSubtitle format to 0. Neither dvdsubdec nor xsubdec intializes format
to 0, but ffplay checks it before displaying subtitles (ffplay.c:1437).
patch by Bj?rn Axelsson, gecko acc.umu se

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

Modified: trunk/libavcodec/dvdsubdec.c
==============================================================================
--- trunk/libavcodec/dvdsubdec.c	Thu Feb 12 02:07:13 2009	(r17169)
+++ trunk/libavcodec/dvdsubdec.c	Thu Feb 12 02:27:56 2009	(r17170)
@@ -175,6 +175,7 @@ static int decode_dvd_subtitles(AVSubtit
         return -1;
     sub_header->rects = NULL;
     sub_header->num_rects = 0;
+    sub_header->format = 0;
     sub_header->start_display_time = 0;
     sub_header->end_display_time = 0;
 

Modified: trunk/libavcodec/xsubdec.c
==============================================================================
--- trunk/libavcodec/xsubdec.c	Thu Feb 12 02:07:13 2009	(r17169)
+++ trunk/libavcodec/xsubdec.c	Thu Feb 12 02:27:56 2009	(r17170)
@@ -51,6 +51,8 @@ static int decode_frame(AVCodecContext *
     int w, h, x, y, rlelen, i;
     GetBitContext gb;
 
+    sub->format = 0;
+
     // check that at least header fits
     if (buf_size < 27 + 7 * 2 + 4 * 3) {
         av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");