Applying: FLIF16 Decoder
Using index info to reconstruct a base tree...
M	Changelog
M	configure
M	libavcodec/Makefile
M	libavcodec/allcodecs.c
M	libavcodec/avcodec.h
M	libavcodec/codec_desc.c
M	libavcodec/parsers.c
Falling back to patching base and 3-way merge...
Auto-merging libavcodec/parsers.c
Auto-merging libavcodec/codec_desc.c
CONFLICT (content): Merge conflict in libavcodec/codec_desc.c
Auto-merging libavcodec/avcodec.h
CONFLICT (content): Merge conflict in libavcodec/avcodec.h
Auto-merging libavcodec/allcodecs.c
Auto-merging libavcodec/Makefile
Auto-merging configure
Auto-merging Changelog
CONFLICT (content): Merge conflict in Changelog
Patch failed at 0001 FLIF16 Decoder
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".