Merge commit 'd59641abfd25a1007bdf4723d952887b1e3619c6'
authorClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:20:57 +0000 (13:20 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:20:57 +0000 (13:20 +0100)
* commit 'd59641abfd25a1007bdf4723d952887b1e3619c6':
  lavc: initialize AVCodecContext.sw_pix_fmt properly

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/options.c

Simple merge