From 66b9e60af0b82ee8bd63d84011127dca4ea1e23f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 4 Nov 2014 20:19:04 +0100 Subject: [PATCH] ffmpeg_opt: store canvas size in decoder context Fixes canvas size Fixes Ticket4074 Signed-off-by: Michael Niedermayer --- ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 27e08902d6..fd1342671e 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -704,7 +704,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) MATCH_PER_STREAM_OPT(fix_sub_duration, i, ist->fix_sub_duration, ic, st); MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st); if (canvas_size && - av_parse_video_size(&dec->width, &dec->height, canvas_size) < 0) { + av_parse_video_size(&ist->dec_ctx->width, &ist->dec_ctx->height, canvas_size) < 0) { av_log(NULL, AV_LOG_FATAL, "Invalid canvas size: %s.\n", canvas_size); exit_program(1); }