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/avidec.c | |
| parent | b27ddffbfb29f456d43c2f155eef5230b940a48b (diff) | |
| parent | 01bcc2d5c23fa757d163530abb396fd02f1be7c8 (diff) | |
| download | ffmpeg-87c88122703f2befcf96383d05bdf14373c22df9.tar.gz | |
Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8'
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
lavc: Drop deprecated destruct_packet related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 3881251a78..30b949770e 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1308,9 +1308,6 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) AVIContext *avi = s->priv_data; AVIOContext *pb = s->pb; int err; -#if FF_API_DESTRUCT_PACKET - void *dstr; -#endif if (CONFIG_DV_DEMUXER && avi->dv_demux) { int size = avpriv_dv_get_packet(avi->dv_demux, pkt); @@ -1427,18 +1424,8 @@ resync: if (CONFIG_DV_DEMUXER && avi->dv_demux) { AVBufferRef *avbuf = pkt->buf; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - dstr = pkt->destruct; -FF_ENABLE_DEPRECATION_WARNINGS -#endif size = avpriv_dv_produce_packet(avi->dv_demux, pkt, pkt->data, pkt->size, pkt->pos); -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = dstr; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->buf = avbuf; pkt->flags |= AV_PKT_FLAG_KEY; if (size < 0) |