[FFmpeg-cvslog] ffmpeg_filter: Do not override the dimensions in sub2video_prepare()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Aug 15 17:27:25 2015 +0200| [72237ef6e933527be7855cb266a2a4df4dcb8096] | committer: Michael Niedermayer

ffmpeg_filter: Do not override the dimensions in sub2video_prepare()

Fixes ticket4744 part1

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 ffmpeg_filter.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 8a96c4b..6a59f05 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -682,8 +682,8 @@ static int sub2video_prepare(InputStream *ist)
         }
         av_log(avf, AV_LOG_INFO, "sub2video: using %dx%d canvas\n", w, h);
     }
-    ist->sub2video.w = ist->dec_ctx->width  = ist->resample_width  = w;
-    ist->sub2video.h = ist->dec_ctx->height = ist->resample_height = h;
+    ist->sub2video.w = ist->resample_width  = w;
+    ist->sub2video.h = ist->resample_height = h;
 
     /* rectangles are AV_PIX_FMT_PAL8, but we have no guarantee that the
        palettes for all rectangles are identical or compatible */