[FFmpeg-cvslog] lavc: fix hw_device_ctx operation

wm4 git at videolan.org
Sun Nov 12 04:31:29 EET 2017


ffmpeg | branch: master | wm4 <nfxjfg at googlemail.com> | Tue Oct 24 00:28:03 2017 +0200| [e724bdfffbd3c27aac53d1f32f20f105f37caef0] | committer: Mark Thompson

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 at jkqxz.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e724bdfffbd3c27aac53d1f32f20f105f37caef0
---

 libavcodec/decode.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 54cda530bb..27f75d73e3 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -698,11 +698,9 @@ int ff_decode_get_hw_frames_ctx(AVCodecContext *avctx,
     ret = avcodec_get_hw_frames_parameters(avctx,
                                            avctx->hw_device_ctx,
                                            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;
-    }
 
     frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
 



More information about the ffmpeg-cvslog mailing list