summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2012-12-19 20:08:56 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-12-19 20:46:11 (GMT)
commit7e6c68394f23a9860bdf96f3bd5ab15e24e3f899 (patch)
treef9f56bc4f16fc346e0b517f1ac30cde85069ab97
parent04a530f7d3fc15124c2f9bc261f319e0181701e6 (diff)
downloadffmpeg-7e6c68394f23a9860bdf96f3bd5ab15e24e3f899.zip
ffmpeg-7e6c68394f23a9860bdf96f3bd5ab15e24e3f899.tar.gz
ffmpeg-7e6c68394f23a9860bdf96f3bd5ab15e24e3f899.tar.bz2
ffmpeg_filter: use frame instead of decoder context pixel format
prevents regressions from h264-mt frame size changing code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--ffmpeg_filter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 65c580c..ebf98c6 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -584,7 +584,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
av_bprintf(&args,
"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:"
"pixel_aspect=%d/%d:sws_param=flags=%d", ist->resample_width,
- ist->resample_height, ist->st->codec->pix_fmt,
+ ist->resample_height, ist->resample_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)