On Mon, Feb 19, 2018 at 08:39:56AM +0100, Felix Matouschek wrote:
> Hello Michael,
> do you think the patch could be merged in its current state?
> It is functional, maybe I can do the cosmetic changes later.
> I was a bit busy the last weeks.
> Would be nice if it could get into the 3.5 / 4.0 release.

not sure if there are issues remaining but it doesnt apply

Applying: avdevice: add android_camera indev
Using index info to reconstruct a base tree...
M       Changelog
M       configure
M       doc/indevs.texi
M       libavdevice/alldevices.c
M       libavdevice/version.h
Falling back to patching base and 3-way merge...
Auto-merging libavdevice/alldevices.c
CONFLICT (content): Merge conflict in libavdevice/alldevices.c
Auto-merging doc/indevs.texi
Auto-merging configure
Auto-merging MAINTAINERS
Auto-merging Changelog
CONFLICT (content): Merge conflict in Changelog
error: Failed to merge in the changes.
Patch failed at 0001 avdevice: add android_camera indev
The copy of the patch that failed is found in: .git/rebase-apply/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".

Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Democracy is the form of government in which you can choose your dictator

Attachment: signature.asc
Description: PGP signature

ffmpeg-devel mailing list

Reply via email to