har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/nsvdec: Use av_packet_move_ref() for packet ownership transfer

Browse Source 
Also simply return 0 in case a packet has been successfully read.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-03-21 08:57:19 +01:00
parent ba36a07734
commit 9a96677023
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/nsvdec.c
View File

@ -662,10 +662,8 @@ static int nsv_read_packet(AVFormatContext *s, AVPacket *pkt)
/* now pick one of the plates */ /* now pick one of the plates */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (nsv->ahead[i].data) { if (nsv->ahead[i].data) {
/* avoid the cost of new_packet + memcpy(->data) */ av_packet_move_ref(pkt, &nsv->ahead[i]);
memcpy(pkt, &nsv->ahead[i], sizeof(AVPacket)); return 0;
nsv->ahead[i].data = NULL; /* we ate that one */
return pkt->size;
} }
} }