Re: [FFmpeg-devel] [PATCH 2/2] avformat/mov: default to Monoscopic view when parsing eyes box

[Michael Niedermayer <michael@niedermayer.cc>]

[-- Attachment #1.1: Type: text/plain, Size: 2241 bytes --]

On Sat, Jun 22, 2024 at 06:34:49PM -0300, James Almer wrote:
> On 6/22/2024 6:25 PM, Michael Niedermayer wrote:
> > On Fri, Jun 21, 2024 at 10:25:31PM -0300, James Almer wrote:
> > > Signed-off-by: James Almer <jamrial@gmail.com>
> > > ---
> > >   libavformat/mov.c | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > doesnt apply automatically with "git am" with the v2
> > 
> > Applying: avformat/mov: default to Monoscopic view when parsing eyes box
> > error: sha1 information is lacking or useless (libavformat/mov.c).
> > error: could not build fake ancestor
> > Patch failed at 0001 avformat/mov: default to Monoscopic view when parsing eyes box
> > 
> > it applies with patch but inability to automatically apply patches
> > could affect tools which try to test patches posted
> > 
> > git am --show-current-patch=diff | patch -p1
> > patching file libavformat/mov.c
> > Hunk #1 succeeded at 6546 with fuzz 2.
> 
> Are you sure your tree is clean and up to date? There's no reason for this
> patch to not apply, standalone or after 1/1 v1 or v2.

the patch says this:
index 50e171c960..4fa39cf4fd 100644

git fetch origin
git fetch jamrial
git show 50e171c960
fatal: ambiguous argument '50e171c960': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

git show 4fa39cf4fd
fatal: ambiguous argument '4fa39cf4fd': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'


so i think the blob this patch was based on is not in any repository known to my git
It might be able to apply the patch anyway but not having the full file this patch
is based on makes it harder for git. I did have other patches applied.
so git would try to merge this in and if needed produce conflict markers but
given that it doesnt seem to have the file this was based on it freaked out


thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

While the State exists there can be no freedom; when there is freedom there
will be no State. -- Vladimir Lenin

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".