[FFmpeg-cvslog] ffmpeg_opt: store canvas size in decoder context

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  4 20:19:04 2014 +0100| [f9ca1fecb0fdd427634cfeed4389e7f2a184ef7a] | committer: Carl Eugen Hoyos

ffmpeg_opt: store canvas size in decoder context

Fixes canvas size
Fixes Ticket4074

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 66b9e60af0b82ee8bd63d84011127dca4ea1e23f)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9ca1fecb0fdd427634cfeed4389e7f2a184ef7a
---

 ffmpeg_opt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 05ab652..0c7b35a 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);
             }