The VideoLAN Forums

Using index info to reconstruct a base tree... M contrib/src/ffmpeg/rules.mak Falling back to patching base and 3-way merge... Auto-merging contrib/src/ffmpeg/rules.mak CONFLICT (content): Merge conflict in contrib/src/ffmpeg/rules.mak Failed to merge in the changes. Patch failed at 0023 contrib/lib...

I am having the same issue here

.../ImportedSources/vlc/include/vlc/deprecated.h'
has been modified since the precompiled header

The environment is:
1. XCode 5.0.2
2. sdk: iphoneos 7.0
3. MountainLion, 10.8.5