[FFmpeg-devel] [PATCH v2 02/19] swscale: rename SwsContext to SwsInternal

Michael Niedermayer michael at niedermayer.cc
Mon Oct 14 17:55:39 EEST 2024


On Mon, Oct 14, 2024 at 03:37:27PM +0200, Niklas Haas wrote:
> From: Niklas Haas <git at haasn.dev>
> 
> And preserve the public SwsContext as separate name. The motivation here
> is that I want to turn SwsContext into a public struct, while keeping the
> internal implementation hidden. Additionally, I also want to be able to
> use multiple internal implementations, e.g. for GPU devices.
> 
> This commit does not include any functional changes. For the most part, it is
> a simple rename. The only complications arise from the public facing API
> functions, which preserve their current type (and hence require an additional
> unwrapping step internally), and the checkasm test framework, which directly
> accesses SwsInternal.
> 
> For consistency, the affected functions that need to maintain a distionction
> have generally been changed to refer to the SwsContext as *sws, and the
> SwsInternal as *c.
> 
> In an upcoming commit, I will provide a backing definition for the public
> SwsContext, and update `sws_internal()` to dereference the internal struct
> instead of merely casting it.
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Niklas Haas <git at haasn.dev>

does not apply


Applying: swscale: rename SwsContext to SwsInternal
Using index info to reconstruct a base tree...
M	libswscale/output.c
M	libswscale/utils.c
Falling back to patching base and 3-way merge...
Auto-merging libswscale/utils.c
Auto-merging libswscale/output.c
CONFLICT (content): Merge conflict in libswscale/output.c
error: Failed to merge in the changes.
Patch failed at 0001 swscale: rename SwsContext to SwsInternal
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 advice.mergeConflict false"

thx

[...]

--
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you drop bombs on a foreign country and kill a hundred thousand
innocent people, expect your government to call the consequence
"unprovoked inhuman terrorist attacks" and use it to justify dropping
more bombs and killing more people. The technology changed, the idea is old.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20241014/5e53144a/attachment.sig>


More information about the ffmpeg-devel mailing list