[FFmpeg-devel] [PATCH] Making process of uuid-xmp faster.

[Michael Niedermayer]

On Tue, Nov 08, 2016 at 11:04:35PM +0800, Chen Meng wrote:
> From baee22d71825128f74beb15122cd786f8d89f13f Mon Sep 17 00:00:00 2001
> From: Chen Meng <mengchen.mc at alibaba-inc.com>
> Date: Tue, 8 Nov 2016 22:58:44 +0800
> Subject: [PATCH] Take the error code in return.

git refuses to apply this

Applying: Making process of uuid-xmp faster.
fatal: unrecognized input
error: could not build fake ancestor
Patch failed at 0001 Making process of uuid-xmp faster.
The copy of the patch that failed is found in: .git/rebase-apply/patch


> 
> ---
>  libavformat/mov.c | 30 ++++++++++++++----------------
>  1 file changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/libavformat/mov.c b/libavformat/mov.c
> index 388cd1f..c86252c 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have often repented speaking, but never of holding my tongue.
-- Xenocrates
-------------- 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/20161108/194a374d/attachment.sig>