| Message ID | 20240622012531.5523-2-jamrial@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avutil/stereo3d add Monoscopic View enum value | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | fail | Make fate failed |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | fail | Make fate failed |
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. thx [...]
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. In any case, this set and the next are withdrawn as i realized i mistakenly assumed AVStereo3DView was a new enum, when it's not. I'll be sending a new set later. > > thx > > [...] > > > _______________________________________________ > 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".
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 [...]
diff --git a/libavformat/mov.c b/libavformat/mov.c index 50e171c960..4fa39cf4fd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6546,7 +6546,7 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) int size, flags = 0; int64_t remaining; uint32_t tag, baseline = 0; - enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED; + enum AVStereo3DView view = AV_STEREO3D_VIEW_MONO; enum AVStereo3DPrimaryEye primary_eye = AV_PRIMARY_EYE_NONE; AVRational horizontal_disparity_adjustment = { 0, 1 };
Signed-off-by: James Almer <jamrial@gmail.com> --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)