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

[Derek Buitenhuis]

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>"

- Derek