diff options
| author | Björn Axelsson <gecko@acc.umu.se> | 2009-02-12 01:27:56 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-02-12 01:27:56 +0000 |
| commit | 37a43cfb3921a0b80157ea658d408bd08ab68306 (patch) | |
| tree | 1de852f1059ffe464cb4ad0536fce60036b19505 | |
| parent | 508048afe2970529903378a10f276bae5d4422e0 (diff) | |
| download | ffmpeg-37a43cfb3921a0b80157ea658d408bd08ab68306.tar.gz | |
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
Originally committed as revision 17170 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dvdsubdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/xsubdec.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 31e7a47b00..9691e384f4 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -175,6 +175,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, 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; diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 0274705fb2..35b00a54b4 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -51,6 +51,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, 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"); |