Merge commit 'f65285aba0df7d46298abe0c945dfee05cbc6028'
authorClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:21:01 +0000 (13:21 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:21:01 +0000 (13:21 +0100)
* commit 'f65285aba0df7d46298abe0c945dfee05cbc6028':
  lavc: set sw_pix_fmt for hwaccel encoding

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

Simple merge