History

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).

wm4 committed 9 years ago

Commit e724bdf1 parent 68649bf1 file · +2 −4Browse files

Unified · Split

libavcodec/decode.c+2−4
@@ -698,11 +698,9 @@ int ff_decode_get_hw_frames_ctx(AVCodecContext *avctx, · 697 unmodified lines
698 ret = avcodec_get_hw_frames_parameters(avctx,698 ret = avcodec_get_hw_frames_parameters(avctx,
699 avctx->hw_device_ctx,699 avctx->hw_device_ctx,
700 avctx->hwaccel->pix_fmt,700 avctx->hwaccel->pix_fmt,
701 avctx->hw_frames_ctx);701 &avctx->hw_frames_ctx);
702 if (ret < 0) {702 if (ret < 0)
703 av_buffer_unref(&avctx->hw_frames_ctx);
704 return ret;703 return ret;
705 }
706 704
707 frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;705 frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
708 706

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t