Applying: Encapsulation macro to get width and height of macroblock
Using index info to reconstruct a base tree...
M	libavcodec/mpegutils.h
Falling back to patching base and 3-way merge...
Auto-merging libavcodec/mpegutils.h
CONFLICT (content): Merge conflict in libavcodec/mpegutils.h
Patch failed at 0001 Encapsulation macro to get width and height of macroblock
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".