summaryrefslogtreecommitdiff
path: root/ffmpeg_filter.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-11-11 14:47:49 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-11-13 15:16:14 +0100
commitca7cdffb70c5fcf04c442c53600c3beb1ba01417 (patch)
tree9812a128e646e283e6285d7762656f72aafdc9ff /ffmpeg_filter.c
parent7112b56a3413b68261e3db0314343e26c75be83b (diff)
ffmpeg_filter: fix hwaccel transcoding
Based on a patch by Yogender Gupta <ygupta@nvidia.com>
Diffstat (limited to 'ffmpeg_filter.c')
-rw-r--r--ffmpeg_filter.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 2a9be6446f..a54d1f2752 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -1142,8 +1142,9 @@ int ifilter_parameters_from_decoder(InputFilter *ifilter, const AVCodecContext *
ifilter->channels = avctx->channels;
ifilter->channel_layout = avctx->channel_layout;
- if (avctx->hw_frames_ctx) {
- ifilter->hw_frames_ctx = av_buffer_ref(avctx->hw_frames_ctx);
+ if (ifilter->ist && ifilter->ist->hw_frames_ctx) {
+ ifilter->format = ifilter->ist->resample_pix_fmt;
+ ifilter->hw_frames_ctx = av_buffer_ref(ifilter->ist->hw_frames_ctx);
if (!ifilter->hw_frames_ctx)
return AVERROR(ENOMEM);
}