[FFmpeg-devel] [PATCH 17/17] lavfi/buffersink: move to the new design.

[Michael Niedermayer]

On Sat, Dec 24, 2016 at 06:41:49PM +0100, Nicolas George wrote:
> Signed-off-by: Nicolas George <george at nsup.org>
> ---
>  libavfilter/buffersink.c | 211 ++++++++++++-----------------------------------
>  1 file changed, 54 insertions(+), 157 deletions(-)

this seems not applying cleanly here

Applying: lavfi/buffersink: move to the new design.
error: patch failed: libavfilter/buffersink.c:281
error: libavfilter/buffersink.c: patch does not apply
Patch failed at 0001 lavfi/buffersink: move to the new design.
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When the tyrant has disposed of foreign enemies by conquest or treaty, and
there is nothing more to fear from them, then he is always stirring up
some war or other, in order that the people may require a leader. -- Plato
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20161225/2dc65856/attachment.sig>