diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 14:37:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 14:37:52 +0200 |
| commit | 09b09ef4ab5c20feb815cb6ef7a297b8c046f44e (patch) | |
| tree | f44f337cccec014c2a323313d47f7961a7b819ce /libavformat/yop.c | |
| parent | 9bb86faca7936f6dba93aa3b11fc24f19c7878a4 (diff) | |
| parent | d8b68660145c76a23fc9665f96932449514ecad2 (diff) | |
Merge commit 'd8b68660145c76a23fc9665f96932449514ecad2'
* 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>
Diffstat (limited to 'libavformat/yop.c')
| -rw-r--r-- | libavformat/yop.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/yop.c b/libavformat/yop.c index c84deea58e..e962b093e8 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -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; |