[FFmpeg-cvslog] avformat/yop: Use av_packet_move_ref() for packet ownership transfer
Andreas Rheinhardt
git at videolan.org
Thu Mar 26 21:59:35 EET 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Mar 21 18:38:00 2020 +0100| [d643bd496089612390f47bda61478fca4e2fe906] | committer: Andreas Rheinhardt
avformat/yop: Use av_packet_move_ref() for packet ownership transfer
Also return 0 after successfully reading a packet.
Reviewed-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d643bd496089612390f47bda61478fca4e2fe906
---
libavformat/yop.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavformat/yop.c b/libavformat/yop.c
index f9ead026a2..0d8d9f2ff7 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -125,14 +125,11 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt)
yop->video_packet.stream_index = 1;
if (yop->video_packet.data) {
- *pkt = yop->video_packet;
- yop->video_packet.data = NULL;
- yop->video_packet.buf = NULL;
- yop->video_packet.size = 0;
+ av_packet_move_ref(pkt, &yop->video_packet);
pkt->data[0] = yop->odd_frame;
pkt->flags |= AV_PKT_FLAG_KEY;
yop->odd_frame ^= 1;
- return pkt->size;
+ return 0;
}
ret = av_new_packet(&yop->video_packet,
yop->frame_size - yop->audio_block_length);
@@ -166,7 +163,7 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt)
av_shrink_packet(&yop->video_packet, yop->palette_size + ret);
// Arbitrarily return the audio data first
- return yop->audio_block_length;
+ return 0;
err_out:
av_packet_unref(&yop->video_packet);
More information about the ffmpeg-cvslog
mailing list