Skip to content
Snippets Groups Projects
Commit 37a43cfb authored by Björn Axelsson's avatar Björn Axelsson Committed by Diego Biurrun
Browse files

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
parent 508048af
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment