projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7167ac3 c011bed)
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)
* 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>

Trivial merge
FFmpeg git repo