[FFmpeg-devel] [PATCH] libavcodec/libx264.c: distinguish between x264 parameter errors

[Michael Niedermayer]

On Mon, Jul 18, 2011 at 10:57:22AM +0200, Erik Slagter wrote:
> ping...

Applying: libx264.c: distinguish between x264 parameter errors.
error: patch failed: libavcodec/libx264.c:198
error: libavcodec/libx264.c: patch does not apply
Patch failed at 0001 libx264.c: distinguish between x264 parameter errors.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20110718/afdee5a7/attachment.asc>