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

Merge commit 'd8b68660145c76a23fc9665f96932449514ecad2'

Browse Source 
* commit 'd8b68660145c76a23fc9665f96932449514ecad2':
  yop: Clear all references to the AVBuffer in the local AVPacket

Conflicts:
	libavformat/yop.c

See: 551f683861bbae1002542e70dc196244a1cd24ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-20 14:37:52 +02:00
commit 09b09ef4ab
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/yop.c
View File

@ -135,7 +135,14 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt)
if (yop->video_packet.data) { if (yop->video_packet.data) {
*pkt = yop->video_packet; *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->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;