diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-05-27 12:54:48 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-06-25 12:10:42 +0200 |
commit | 232399e3ee219d16d0e0d482c9f31a26202d4993 (patch) | |
tree | f1c3252463b7f4daaffc723f42b89ff613c16ace | |
parent | a3a0230a9870b9018dc7415ae5872784d524cfe5 (diff) |
avconv: pass the hwaccel frames context to the decoder
-rw-r--r-- | avconv.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1616,6 +1616,13 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat } continue; } + + if (ist->hw_frames_ctx) { + s->hw_frames_ctx = av_buffer_ref(ist->hw_frames_ctx); + if (!s->hw_frames_ctx) + return AV_PIX_FMT_NONE; + } + ist->active_hwaccel_id = hwaccel->id; ist->hwaccel_pix_fmt = *p; break; |