Applying: avcodec/tdsc: Fix tile checks
Applying: swscale/tests/swscale: use codes < 128 for indicating erros
Using index info to reconstruct a base tree...
M	libswscale/tests/swscale.c
Falling back to patching base and 3-way merge...
Auto-merging libswscale/tests/swscale.c
CONFLICT (content): Merge conflict in libswscale/tests/swscale.c
Patch failed at 0002 swscale/tests/swscale: use codes < 128 for indicating erros
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.