One commit has already been ported.
Hand apply 2ca95420ee3e5d1bb740c63c2227b243373f5e8d from master; better error on av_buffersrc_write_frame failure.
Update TO_PORT.
Hand apply ea9331588a0c55ea132ffc91c7bce52d91d5bae6 from master; put job errors in the logs.