[FFmpeg-cvslog] ffmpeg_filter: use frame instead of decoder context pixel format

Michael Niedermayer git at videolan.org
Wed Dec 19 21:52:19 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 21:08:56 2012 +0100| [7e6c68394f23a9860bdf96f3bd5ab15e24e3f899] | committer: Michael Niedermayer

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 at gmx.at>

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

 ffmpeg_filter.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)



More information about the ffmpeg-cvslog mailing list