diff options
| author | wm4 <nfxjfg@googlemail.com> | 2017-06-06 18:51:08 +0200 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2017-06-27 18:05:02 +0200 |
| commit | 865360ba633b09f1292d52ba6d07f16b6bcef6df (patch) | |
| tree | 0847cfd92293d080e8b7c09c5b846915c67b73b3 | |
| parent | 3303511f33dcc1b708fc18072cd93bca62196676 (diff) | |
| download | ffmpeg-865360ba633b09f1292d52ba6d07f16b6bcef6df.tar.gz | |
lavc: set avctx->hwaccel before init
So a hwaccel can access avctx->hwaccel in init for whatever reason. This
is for the new d3d hwaccel API. We could create separate entrypoints for
each of the 3 hwaccel types (dxva2, d3d11va, new d3d11va), but this
seems nicer.
Merges Libav commit bd747b9226414007f0207fa201976af7217e3b77.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavcodec/decode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index f7dea930ed..dccce01402 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1248,16 +1248,16 @@ static int setup_hwaccel(AVCodecContext *avctx, return AVERROR(ENOMEM); } + avctx->hwaccel = hwa; if (hwa->init) { ret = hwa->init(avctx); if (ret < 0) { av_freep(&avctx->internal->hwaccel_priv_data); + avctx->hwaccel = NULL; return ret; } } - avctx->hwaccel = hwa; - return 0; } |