summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2012-12-19 19:58:44 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-12-19 20:46:11 (GMT)
commit04a530f7d3fc15124c2f9bc261f319e0181701e6 (patch)
tree94837fcfb25df14013534c077e7fa416ad742403
parent8ea4a5533f4dd187211c2ad13ead4142f266400d (diff)
downloadffmpeg-04a530f7d3fc15124c2f9bc261f319e0181701e6.zip
ffmpeg-04a530f7d3fc15124c2f9bc261f319e0181701e6.tar.gz
ffmpeg-04a530f7d3fc15124c2f9bc261f319e0181701e6.tar.bz2
ffmpeg_filter: use frame dimensions instead of decoder context dimensions.
avoids regression from the h264-mt frame size change code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--ffmpeg_filter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index f550bd4..65c580c 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -583,8 +583,8 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
av_bprint_init(&args, 0, 1);
av_bprintf(&args,
"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:"
- "pixel_aspect=%d/%d:sws_param=flags=%d", ist->st->codec->width,
- ist->st->codec->height, ist->st->codec->pix_fmt,
+ "pixel_aspect=%d/%d:sws_param=flags=%d", ist->resample_width,
+ ist->resample_height, ist->st->codec->pix_fmt,
tb.num, tb.den, sar.num, sar.den,
SWS_BILINEAR + ((ist->st->codec->flags&CODEC_FLAG_BITEXACT) ? SWS_BITEXACT:0));
if (fr.num && fr.den)