diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-04 20:19:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-04 20:55:15 +0100 |
| commit | 66b9e60af0b82ee8bd63d84011127dca4ea1e23f (patch) | |
| tree | 0901d636b7084f1bdf43493e5c65c28227837883 /ffmpeg_opt.c | |
| parent | 786594184a1797cc4b573001f3eeb188d5912062 (diff) | |
| download | ffmpeg-66b9e60af0b82ee8bd63d84011127dca4ea1e23f.tar.gz | |
ffmpeg_opt: store canvas size in decoder context
Fixes canvas size
Fixes Ticket4074
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -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 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); } |