diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 17:26:27 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 17:31:15 +0400 |
| commit | 62e10c375968d9cbbe2a0bc321e00eef52d32917 (patch) | |
| tree | 8c8a3a4b025d3cf54abb44a3ab988c58c2c9e615 /ffmpeg_filter.c | |
| parent | 94194bdcd7bfc2137ccd13e5c149567b9a917f4f (diff) | |
| parent | 07fd0a22192805d56c635eb294dc26b0a54ae325 (diff) | |
Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'
* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
avconv: add infrastructure for using hwaccels
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 461cc900fe..ad97f0dd81 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -654,7 +654,8 @@ 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->resample_pix_fmt, + ist->resample_height, + ist->hwaccel_retrieve_data ? ist->hwaccel_retrieved_pix_fmt : 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) |