Le mer. 2 avr. 2025 à 12:43, Michael Niedermayer <mich...@niedermayer.cc> a écrit : > > On Mon, Mar 24, 2025 at 09:50:52AM -0500, Romain Beauxis wrote: > > --- > > libavcodec/decode.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 131 insertions(+) > > doesnt apply cleanly: > > Applying: libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` packet extra data, attach them to the next decoded frame with the same PTS. > Using index info to reconstruct a base tree... > M libavcodec/decode.c > .git/rebase-apply/patch:74: tab in indent. > ret->data = pending->data; > warning: 1 line adds whitespace errors. > Falling back to patching base and 3-way merge... > Auto-merging libavcodec/decode.c > CONFLICT (content): Merge conflict in libavcodec/decode.c > error: Failed to merge in the changes. > Patch failed at 0001 libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` packet extra data, attach them to the next decoded frame with the same PTS. > hint: Use 'git am --show-current-patch=diff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am --abort". > hint: Disable this message with "git config set advice.mergeConflict false"
About to send a rebase. > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > No human being will ever know the Truth, for even if they happen to say it > by chance, they would not even known they had done so. -- Xenophanes > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
