On Fri, Dec 03, 2021 at 07:31:06PM +0000, Soft Works wrote: > Signed-off-by: softworkz <softwo...@hotmail.com> > --- > doc/APIchanges | 6 ++++ > libavcodec/avcodec.h | 19 +------------ > libavutil/Makefile | 1 + > libavutil/subfmt.h | 66 ++++++++++++++++++++++++++++++++++++++++++++ > libavutil/version.h | 1 + > 5 files changed, 75 insertions(+), 18 deletions(-) > create mode 100644 libavutil/subfmt.h
Some of the patches in this patchset do not apply cleanly to master anymore Applying: avcodec, avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values Using index info to reconstruct a base tree... M doc/APIchanges M libavutil/version.h Falling back to patching base and 3-way merge... Auto-merging libavutil/version.h Auto-merging doc/APIchanges CONFLICT (content): Merge conflict in doc/APIchanges error: Failed to merge in the changes. Patch failed at 0001 avcodec, avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values Use 'git am --show-current-patch' to see the failed 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 In fact, the RIAA has been known to suggest that students drop out of college or go to community college in order to be able to afford settlements. -- The RIAA
signature.asc
Description: PGP signature
_______________________________________________ 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".
