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/mxg.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/mxg.c')
| -rw-r--r-- | libavformat/mxg.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavformat/mxg.c b/libavformat/mxg.c index b95f5426b3..45cc5b5284 100644 --- a/libavformat/mxg.c +++ b/libavformat/mxg.c @@ -171,11 +171,6 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->pts = pkt->dts = mxg->dts; pkt->stream_index = 0; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = NULL; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->buf = NULL; pkt->size = mxg->buffer_ptr - mxg->soi_ptr; pkt->data = mxg->soi_ptr; @@ -214,11 +209,6 @@ FF_ENABLE_DEPRECATION_WARNINGS /* time (GMT) of first sample in usec since 1970, little-endian */ pkt->pts = pkt->dts = AV_RL64(startmarker_ptr + 8); pkt->stream_index = 1; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = NULL; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->buf = NULL; pkt->size = size - 14; pkt->data = startmarker_ptr + 16; |