From: Andreas Rheinhardt Date: Sat, 21 Mar 2020 17:38:00 +0000 (+0100) Subject: avformat/yop: Use av_packet_move_ref() for packet ownership transfer X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d643bd496089612390f47bda61478fca4e2fe906;p=ffmpeg avformat/yop: Use av_packet_move_ref() for packet ownership transfer Also return 0 after successfully reading a packet. Reviewed-by: Anton Khirnov Signed-off-by: Andreas Rheinhardt --- diff --git a/libavformat/yop.c b/libavformat/yop.c index f9ead026a25..0d8d9f2ff7c 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);