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/rmdec.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/rmdec.c')
| -rw-r--r-- | libavformat/rmdec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 09889f6efa..59a80355e0 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -834,11 +834,6 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb, vst->pkt.data= NULL; vst->pkt.size= 0; vst->pkt.buf = NULL; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - vst->pkt.destruct = NULL; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices, vst->videobufpos - 1 - 8*vst->slices); |