diff options
| author | Michael Niedermayer <[email protected]> | 2014-11-04 20:19:04 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <[email protected]> | 2014-11-05 09:54:35 +0100 |
| commit | f9ca1fecb0fdd427634cfeed4389e7f2a184ef7a (patch) | |
| tree | 69834ccf3cdb277faf86c02c97d1846ba8f3166b | |
| parent | cd57d608a4125a996671e7d013767120cb60513d (diff) | |
ffmpeg_opt: store canvas size in decoder context
Fixes canvas size
Fixes Ticket4074
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 66b9e60af0b82ee8bd63d84011127dca4ea1e23f)
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 05ab652f1a..0c7b35a269 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -702,7 +702,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); } |