Merge commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9'
authorClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 11:57:02 +0000 (12:57 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 11:57:02 +0000 (12:57 +0100)
* commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9':
  mpegvideo_enc: handle encoding errors with b_strategy=2

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

Simple merge