Skip to content
Snippets Groups Projects
Commit a2836656 authored by Clément Bœsch's avatar Clément Bœsch
Browse files

Merge commit 'e46a6fb7'


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

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

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

Merged-by: default avatarClément Bœsch <cboesch@gopro.com>
parents 67e2ba36 e46a6fb7
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment