[FFmpeg-devel] [PATCH] Respect payload offset in av_grow_packet

[Michael Niedermayer]

On Fri, May 13, 2016 at 03:15:07PM +0300, Andriy Lysnevych wrote:
> The patch fixes the function when used with reference-counted packets
> that have payload offset.
> 
> Also this function is dangerous for not reference-counted packets
> because it just overwrites pkt->data. Probably it is better to
> restrict using it with not referenced-counted packets because you
> simply don't know how to do grow\realloc in this case.
> 
> h264_mp4toannexb and h265_mp4toannexb already call av_grow_packet on
> input packets that leads to memory leak in case of not reference
> counted packets.
> 
> ---
>  libavcodec/avpacket.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)

Applying: Respect payload offset in av_grow_packet
fatal: corrupt patch at line 51
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Respect payload offset in av_grow_packet
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Everything should be made as simple as possible, but not simpler.
-- Albert Einstein
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160514/ce96cdc8/attachment.sig>