summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-05-27 12:54:48 +0200
committerAnton Khirnov <anton@khirnov.net>2016-05-30 17:08:56 +0200
commit3dc8dfaa80c2c4401f72a8ebbc4909773576c73a (patch)
treec383a9031375a43967cfc892476a2a3379dec2b4
parent17b73fdfcce3578ef69183356928176188b41033 (diff)
avconv: pass the hwaccel frames context to the decoder
-rw-r--r--avconv.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/avconv.c b/avconv.c
index 159cd9a01e..6b84b383e9 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1608,6 +1608,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;