virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Also return 0 after successfully reading a packet.

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 18:38:00 +01:00
parent 9a96677023
commit d643bd4960
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/yop.c
View File

@ -125,14 +125,11 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt)
yop->video_packet.stream_index = 1; yop->video_packet.stream_index = 1;
if (yop->video_packet.data) { if (yop->video_packet.data) {
*pkt = yop->video_packet; av_packet_move_ref(pkt, &yop->video_packet);
yop->video_packet.data = NULL;
yop->video_packet.buf = NULL;
yop->video_packet.size = 0;
pkt->data[0] = yop->odd_frame; pkt->data[0] = yop->odd_frame;
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
yop->odd_frame ^= 1; yop->odd_frame ^= 1;
return pkt->size; return 0;
} }
ret = av_new_packet(&yop->video_packet, ret = av_new_packet(&yop->video_packet,
yop->frame_size - yop->audio_block_length); 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); av_shrink_packet(&yop->video_packet, yop->palette_size + ret);
// Arbitrarily return the audio data first // Arbitrarily return the audio data first
return yop->audio_block_length; return 0;
err_out: err_out:
av_packet_unref(&yop->video_packet); av_packet_unref(&yop->video_packet);