[FFmpeg-cvslog] Merge commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Sep  2 19:25:16 2018 -0300| [c0a647644f2703e1da980dcf988cefd81528d8c9] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0a647644f2703e1da980dcf988cefd81528d8c9
---