Merge commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195'
authorClément Bœsch <cboesch@gopro.com>
Wed, 15 Mar 2017 13:25:46 +0000 (14:25 +0100)
committerClément Bœsch <cboesch@gopro.com>
Wed, 15 Mar 2017 13:28:43 +0000 (14:28 +0100)
commita283665693e1c9804b2736545dba77d0ee342f9e
tree3caa047a3c52d62b55c1e536befa76d43f6daf87
parent67e2ba36ec5096a875e377fa1703c535e7eef081
parente46a6fb7732a7caef97a916a4f765ec0f779d195
Merge commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195'

* commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195':
  avconv: Check that muxing_queue exists before reading from it

Mostly noop. This was fixed in FFmpeg in 7f7c494a3.

The merge makes the cosmetics match but does not include the weird
av_log().

Merged-by: Clément Bœsch <cboesch@gopro.com>
ffmpeg.c