Commit 66b9e60a authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg_opt: store canvas size in decoder context

Fixes canvas size
Fixes Ticket4074
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 78659418
...@@ -704,7 +704,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ...@@ -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(fix_sub_duration, i, ist->fix_sub_duration, ic, st);
MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st); MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st);
if (canvas_size && 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); av_log(NULL, AV_LOG_FATAL, "Invalid canvas size: %s.\n", canvas_size);
exit_program(1); exit_program(1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment