generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set AVSubtitle format to 0. Neither dvdsubdec nor xsubdec intializes format

Browse Source 
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
This commit is contained in:
Björn Axelsson 2009-02-12 01:27:56 +00:00 committed by Diego Biurrun
parent 508048afe2
commit 37a43cfb39
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/dvdsubdec.c
View File

@ -175,6 +175,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header,
return -1; return -1;
sub_header->rects = NULL; sub_header->rects = NULL;
sub_header->num_rects = 0; sub_header->num_rects = 0;
sub_header->format = 0;
sub_header->start_display_time = 0; sub_header->start_display_time = 0;
sub_header->end_display_time = 0; sub_header->end_display_time = 0;

2
libavcodec/xsubdec.c
View File

@ -51,6 +51,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
int w, h, x, y, rlelen, i; int w, h, x, y, rlelen, i;
GetBitContext gb; GetBitContext gb;
sub->format = 0;
// check that at least header fits // check that at least header fits
if (buf_size < 27 + 7 * 2 + 4 * 3) { if (buf_size < 27 + 7 * 2 + 4 * 3) {
av_log(avctx, AV_LOG_ERROR, "coded frame too small\n"); av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");