projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b642290
)
ffmpeg: fix width/height overrides for sub2video processing
author
Hendrik Leppkes
<h.leppkes@gmail.com>
Thu, 3 Nov 2016 15:20:59 +0000
(16:20 +0100)
committer
Hendrik Leppkes
<h.leppkes@gmail.com>
Thu, 3 Nov 2016 15:20:59 +0000
(16:20 +0100)
ffmpeg_filter.c
patch
|
blob
|
history
diff --git
a/ffmpeg_filter.c
b/ffmpeg_filter.c
index
38dfe5c
..
5a0e85e
100644
(file)
--- a/
ffmpeg_filter.c
+++ b/
ffmpeg_filter.c
@@
-692,8
+692,8
@@
static int sub2video_prepare(InputStream *ist, InputFilter *ifilter)
}
av_log(avf, AV_LOG_INFO, "sub2video: using %dx%d canvas\n", w, h);
}
- ist->sub2video.w = ist->resample_width = w;
- ist->sub2video.h = ist->resample_height = h;
+ ist->sub2video.w = ist->resample_width =
ifilter->width =
w;
+ ist->sub2video.h = ist->resample_height =
ifilter->height =
h;
/* rectangles are AV_PIX_FMT_PAL8, but we have no guarantee that the
palettes for all rectangles are identical or compatible */