Commit 09b09ef4 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd8b68660'

* commit 'd8b68660':
  yop: Clear all references to the AVBuffer in the local AVPacket

Conflicts:
	libavformat/yop.c

See: 551f6838Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9bb86fac d8b68660
......@@ -135,7 +135,14 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt)
if (yop->video_packet.data) {
*pkt = yop->video_packet;
memset(&yop->video_packet, 0, sizeof(yop->video_packet));
yop->video_packet.data = NULL;
yop->video_packet.buf = NULL;
#if FF_API_DESTRUCT_PACKET
FF_DISABLE_DEPRECATION_WARNINGS
yop->video_packet.destruct = NULL;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
yop->video_packet.size = 0;
pkt->data[0] = yop->odd_frame;
pkt->flags |= AV_PKT_FLAG_KEY;
yop->odd_frame ^= 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment