[FFmpeg-devel] avformat/rmdec: Use av_packet_move_ref() for packet ownership transfer

Submitted by Andreas Rheinhardt on Dec. 3, 2019, 10:28 a.m.

Details

Message ID 20191203102807.25665-1-andreas.rheinhardt@gmail.com
State Accepted
Commit 296f769fdca523e4ec23552ccb8e6a64bd47227f
Headers show

Commit Message

Andreas Rheinhardt Dec. 3, 2019, 10:28 a.m.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/rmdec.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Michael Niedermayer Dec. 4, 2019, 7:25 p.m.
On Tue, Dec 03, 2019 at 11:28:07AM +0100, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavformat/rmdec.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

will apply

thx

[...]

Patch hide | download patch | download mbox

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index e612c42e57..2c40b866aa 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -836,10 +836,7 @@  static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
 
     if (type == 2 || vst->videobufpos == vst->videobufsize) {
         vst->pkt.data[0] = vst->cur_slice-1;
-        *pkt= vst->pkt;
-        vst->pkt.data= NULL;
-        vst->pkt.size= 0;
-        vst->pkt.buf = NULL;
+        av_packet_move_ref(pkt, &vst->pkt);
         if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin
             memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices,
                 vst->videobufpos - 1 - 8*vst->slices);