Merge commit 'd8b68660145c76a23fc9665f96932449514ecad2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 12:37:52 +0000 (14:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 12:37:52 +0000 (14:37 +0200)
* 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>
libavformat/yop.c

index c84deea..e962b09 100644 (file)
@@ -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;