Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-08-15 18:27:25 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-08-15 18:41:48 +0300
commit72237ef6e933527be7855cb266a2a4df4dcb8096 (patch)
tree7168c69a158e7eaff90d107958acb6ea9da216dc /ffmpeg_filter.c
parentb1f59bb6606721ef5eeade4ada541630d51510fe (diff)
ffmpeg_filter: Do not override the dimensions in sub2video_prepare()
Fixes ticket4744 part1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg_filter.c')
-rw-r--r--ffmpeg_filter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 8a96c4be86..6a59f0547b 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 */