virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-29 21:47:48 +02:00
Code Issues Releases Activity

lavc: fix hw_device_ctx operation

Browse Source 
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>
This commit is contained in:
wm4 2017-10-24 00:28:03 +02:00 committed by Mark Thompson
parent 68649bfed3
commit e724bdfffb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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); &avctx->hw_frames_ctx);
if (ret < 0) { if (ret < 0)
av_buffer_unref(&avctx->hw_frames_ctx);
return ret; return ret;
}
frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data; frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;