Merge commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:25:16 +0000 (19:25 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:25:16 +0000 (19:25 -0300)
commitc0a647644f2703e1da980dcf988cefd81528d8c9
treee5d4d881507af94a2b7f816eee7867a794c8731b
parent7167ac33a8f2c7d063384c267f984f23d2b73854
parentc011beda2611acfeb6f67d4fdf30d1eceed9e62f
Merge commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f'

* commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f':
  avconv: make sure packets put into the muxing FIFO are refcounted

This commit is a noop, see 33580a8625c77591919b6155a48da04dccc8d398

Merged-by: James Almer <jamrial@gmail.com>