[FFmpeg-devel] [PATCH] pixfmt: Support chroma-derived and icpct color matrices

[Michael Niedermayer]

On Tue, Aug 08, 2017 at 04:14:30PM +0200, Vittorio Giovara wrote:
> Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
> ---
> Missing version bump.
> Vittorio
> 
>  libavutil/pixdesc.c | 4 ++++
>  libavutil/pixfmt.h  | 3 +++
>  2 files changed, 7 insertions(+)

doesnt apply cleanly:

Applying: pixfmt: Support chroma-derived and icpct color matrices
error: patch failed: libavutil/pixdesc.c:1806
error: libavutil/pixdesc.c: patch does not apply
error: patch failed: libavutil/pixfmt.h:384
error: libavutil/pixfmt.h: patch does not apply
Patch failed at 0001 pixfmt: Support chroma-derived and icpct color matrices
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

While the State exists there can be no freedom; when there is freedom there
will be no State. -- Vladimir Lenin
-------------- 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/20170809/eb87b492/attachment.sig>