[FFmpeg-devel] [PATCH] lavfi: check refcount before merging.

[Nicolas George]

Le septidi 27 messidor, an CCXXII, Michael Niedermayer a écrit :
> LGTM

Thanks. Then please merge the following commits from my tree:

a65c0a3 lavd/x11grab: disable drawing mouse without XFixes.
36fbe3c lavd/x11grab: change error code for unsupported visuals.
16c6795 lavd/x11grab: check 32-bits color masks.
1d12df1 lavd/x11grab: add an option to disable MIT-SHM.
099aff5 lavfi: check refcount before merging.
8e29768 lavd/x11grab: reindent after last commit.

Regards,

-- 
  Nicolas George
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140717/c859a4bd/attachment.asc>