On Mon, Jul 01, 2024 at 02:16:06PM +0200, Andreas Rheinhardt wrote: > The mpegvideo-based encoders do one uncommon thing with > the packet's data given by ff_alloc_packet(): They potentially > reallocate it. But this only affects the internal buffer > and is not user-facing at all, so one can nevertheless > use the AV_CODEC_CAP_DR1 for them. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > --- > libavcodec/flvenc.c | 2 +- > libavcodec/h261enc.c | 2 +- > libavcodec/ituh263enc.c | 5 +++-- > libavcodec/mjpegenc.c | 5 +++-- > libavcodec/mpeg12enc.c | 6 ++++-- > libavcodec/mpeg4videoenc.c | 3 ++- > libavcodec/msmpeg4enc.c | 6 +++--- > libavcodec/rv10enc.c | 2 +- > libavcodec/rv20enc.c | 2 +- > libavcodec/speedhqenc.c | 2 +- > libavcodec/wmv2enc.c | 2 +- > 11 files changed, 21 insertions(+), 16 deletions(-)
this doesnt apply anymore Applying: avcodec/mpegvideo_enc: Add AV_CODEC_CAP_DR1 Using index info to reconstruct a base tree... M libavcodec/flvenc.c M libavcodec/h261enc.c M libavcodec/ituh263enc.c M libavcodec/mjpegenc.c M libavcodec/mpeg12enc.c M libavcodec/mpeg4videoenc.c M libavcodec/msmpeg4enc.c M libavcodec/rv10enc.c M libavcodec/rv20enc.c M libavcodec/speedhqenc.c M libavcodec/wmv2enc.c Falling back to patching base and 3-way merge... Auto-merging libavcodec/wmv2enc.c Auto-merging libavcodec/speedhqenc.c Auto-merging libavcodec/rv20enc.c Auto-merging libavcodec/rv10enc.c Auto-merging libavcodec/msmpeg4enc.c Auto-merging libavcodec/mpeg4videoenc.c CONFLICT (content): Merge conflict in libavcodec/mpeg4videoenc.c Auto-merging libavcodec/mpeg12enc.c CONFLICT (content): Merge conflict in libavcodec/mpeg12enc.c Auto-merging libavcodec/mjpegenc.c Auto-merging libavcodec/ituh263enc.c Auto-merging libavcodec/h261enc.c CONFLICT (content): Merge conflict in libavcodec/h261enc.c Auto-merging libavcodec/flvenc.c CONFLICT (content): Merge conflict in libavcodec/flvenc.c error: Failed to merge in the changes. Patch failed at 0001 avcodec/mpegvideo_enc: Add AV_CODEC_CAP_DR1 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" [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The difference between a dictatorship and a democracy is that every 4 years the population together is allowed to provide 1 bit of input to the government.
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".
