Applying: lavc, lavfmt: add FLIF decoding support
Using index info to reconstruct a base tree...
M	configure
M	doc/general.texi
M	libavcodec/Makefile
M	libavcodec/allcodecs.c
M	libavcodec/avcodec.h
M	libavcodec/codec_desc.c
M	libavcodec/parsers.c
M	libavcodec/version.h
M	libavformat/Makefile
M	libavformat/allformats.c
M	libavformat/gifdec.c
M	libavformat/version.h
Falling back to patching base and 3-way merge...
Auto-merging libavformat/version.h
CONFLICT (content): Merge conflict in libavformat/version.h
Auto-merging libavformat/gifdec.c
Auto-merging libavformat/allformats.c
Auto-merging libavformat/Makefile
Auto-merging libavcodec/version.h
CONFLICT (content): Merge conflict in libavcodec/version.h
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 doc/general.texi
Auto-merging configure
Patch failed at 0001 lavc, lavfmt: add FLIF decoding support
Use 'git am --show-current-patch' to see the failed 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.