[FFmpeg-cvslog] ffmpeg: pass the hwaccel frames context to the decoder

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Sep 29 10:29:10 2016 +0200| [bfbf86ef18f756c4e27ab569309ef8bc7a5531ac] | committer: Timo Rothenpieler

ffmpeg: pass the hwaccel frames context to the decoder

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

 ffmpeg.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index d0f247e..9a8e65a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2547,6 +2547,13 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat
             }
             continue;
         }
+
+        if (ist->hw_frames_ctx) {
+            s->hw_frames_ctx = av_buffer_ref(ist->hw_frames_ctx);
+            if (!s->hw_frames_ctx)
+                return AV_PIX_FMT_NONE;
+        }
+
         ist->active_hwaccel_id = hwaccel->id;
         ist->hwaccel_pix_fmt   = *p;
         break;