[FFmpeg-cvslog] Merge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed May 11 19:46:13 2016 +0100| [c71c3b9ff4f19a219f11c64f8bd923085ac1b823] | committer: Derek Buitenhuis

Merge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5'

* commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5':
  hwcontext: initialize sw_format in av_hwframe_ctx_alloc()

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 libavutil/hwcontext.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
index b34b317..619f21e 100644
--- a/libavutil/hwcontext.c
+++ b/libavutil/hwcontext.c
@@ -209,6 +209,7 @@ AVBufferRef *av_hwframe_ctx_alloc(AVBufferRef *device_ref_in)
     ctx->device_ref = device_ref;
     ctx->device_ctx = device_ctx;
     ctx->format     = AV_PIX_FMT_NONE;
+    ctx->sw_format  = AV_PIX_FMT_NONE;
 
     ctx->internal->hw_type = hw_type;
 


======================================================================