Merge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 18:46:13 +0000 (19:46 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 18:46:17 +0000 (19:46 +0100)
* commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5':
  hwcontext: initialize sw_format in av_hwframe_ctx_alloc()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavutil/hwcontext.c

Simple merge