Browse Source

lavc: fix hw_device_ctx operation

Commit b46a77f19d accidentally broke this (requested change that was
added to the patch later and which was not fully tested).

Signed-off-by: Mark Thompson <sw@jkqxz.net>
tags/n4.0
wm4 Mark Thompson 7 years ago
parent
commit
e724bdfffb
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavcodec/decode.c

+ 2
- 4
libavcodec/decode.c View File

@@ -698,11 +698,9 @@ int ff_decode_get_hw_frames_ctx(AVCodecContext *avctx,
ret = avcodec_get_hw_frames_parameters(avctx, ret = avcodec_get_hw_frames_parameters(avctx,
avctx->hw_device_ctx, avctx->hw_device_ctx,
avctx->hwaccel->pix_fmt, avctx->hwaccel->pix_fmt,
avctx->hw_frames_ctx);
if (ret < 0) {
av_buffer_unref(&avctx->hw_frames_ctx);
&avctx->hw_frames_ctx);
if (ret < 0)
return ret; return ret;
}


frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data; frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;




Loading…
Cancel
Save