[FFmpeg-devel] [PATCH 2/2] lavd/qtkit: Use a const char* while enumerating devices.

[Michael Niedermayer]

On Wed, Apr 02, 2014 at 07:57:57PM +0100, Derek Buitenhuis wrote:
> On 4/2/2014 7:00 PM, Michael Niedermayer wrote:
> > Applying: lavd/qtkit: Use a const char* while enumerating devices.
> > fatal: sha1 information is lacking or useless (libavdevice/qtkit.m).
> > Repository lacks necessary blobs to fall back on 3-way merge.
> > Cannot fall back to three-way merge.
> > Patch failed at 0001 lavd/qtkit: Use a const char* while enumerating devices.
> 
> patch -p1 < 0002-lavd-qtkit-Use-a-const-char-while-enumerating-device.patch
> git commit -a --author="Thilo Borgmann <thilo.borgmann at mail.de>"

patch -p1 <~/0002-lavd-qtkit-Use-a-const-char-while-enumerating-device.patch
patching file libavdevice/qtkit.m
Hunk #1 FAILED at 153.
1 out of 1 hunk FAILED -- saving rejects to file libavdevice/qtkit.m.rej

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

While the State exists there can be no freedom; when there is freedom there
will be no State. -- Vladimir Lenin
-------------- 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/20140402/cc903ee4/attachment.asc>