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)
commitb2cb9191eaf240649be0b0716b897a96cea7879c
tree2ca0c66891108c8301c53473a9367f0a7e2a12a7
parent70ca9b76e2afb6dc89e0ffdb2753237ed5290009
parentf03f78bc1c99b1e29624418e2f7315b8a47981e9
Merge commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9'

* commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9':
  mpegvideo_enc: handle encoding errors with b_strategy=2

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