From fe79fc2ea55b65141f3d664583d1caaf25d70ae5 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Mon, 27 Aug 2012 17:57:11 +0200 Subject: dvbsubdec: set width/height from display def if not set. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes playback of DVB subtitles in http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket1065/Test1.wtv in MPlayer. FFplay is not affected since it assumes that the subtitles are scaled to match the video - but this usually isn't the case after rescaling the video and stream-copying subtitles. Signed-off-by: Reimar Döffinger --- libavcodec/dvbsubdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index ef90f73c1a..955925a619 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1343,6 +1343,10 @@ static void dvbsub_parse_display_definition_segment(AVCodecContext *avctx, display_def->y = 0; display_def->width = bytestream_get_be16(&buf) + 1; display_def->height = bytestream_get_be16(&buf) + 1; + if (!avctx->width || !avctx->height) { + avctx->width = display_def->width; + avctx->height = display_def->height; + } if (buf_size < 13) return; -- cgit v1.2.3