diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:50:09 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:50:09 +0200 |
commit | 87c88122703f2befcf96383d05bdf14373c22df9 (patch) | |
tree | 440194d29f606b9926ad57b9a15d0709ee12ccd7 /libavformat/yop.c | |
parent | b27ddffbfb29f456d43c2f155eef5230b940a48b (diff) | |
parent | 01bcc2d5c23fa757d163530abb396fd02f1be7c8 (diff) |
Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8'
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
lavc: Drop deprecated destruct_packet related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/yop.c')
-rw-r--r-- | libavformat/yop.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/yop.c b/libavformat/yop.c index 81b3cc2b32..64779d4fb7 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -132,11 +132,6 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt) *pkt = 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; |