diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:51:53 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:51:53 +0200 |
| commit | 83a5df54eae6dddea7c453fd25c45c7b9c148925 (patch) | |
| tree | dd2055e828b1c4dce1b80b0f077c4a658e7700f7 /libavformat | |
| parent | 87c88122703f2befcf96383d05bdf14373c22df9 (diff) | |
| download | ffmpeg-83a5df54eae6dddea7c453fd25c45c7b9c148925.tar.gz | |
Remove left-over FF_API_DESTRUCT_PACKET cruft
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfdec_f.c | 5 | ||||
| -rw-r--r-- | libavformat/mux.c | 5 | ||||
| -rw-r--r-- | libavformat/tee.c | 8 |
3 files changed, 1 insertions, 17 deletions
diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index a30b7d7212..7c31cfaee4 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -1420,11 +1420,6 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) } asf_st->frag_offset = 0; *pkt = asf_st->pkt; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - asf_st->pkt.destruct = NULL; -FF_ENABLE_DEPRECATION_WARNINGS -#endif asf_st->pkt.buf = 0; asf_st->pkt.size = 0; asf_st->pkt.data = 0; diff --git a/libavformat/mux.c b/libavformat/mux.c index a57b69642c..f2c137fa9e 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1059,11 +1059,6 @@ int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, pkt->buf = local_pkt.buf; pkt->side_data = local_pkt.side_data; pkt->side_data_elems = local_pkt.side_data_elems; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = local_pkt.destruct; -FF_ENABLE_DEPRECATION_WARNINGS -#endif return ret; } diff --git a/libavformat/tee.c b/libavformat/tee.c index bc2e522f7c..c619eae5db 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -396,13 +396,7 @@ static int filter_packet(void *log_ctx, AVPacket *pkt, &new_pkt.data, &new_pkt.size, pkt->data, pkt->size, pkt->flags & AV_PKT_FLAG_KEY); -FF_DISABLE_DEPRECATION_WARNINGS - if (ret == 0 && new_pkt.data != pkt->data -#if FF_API_DESTRUCT_PACKET - && new_pkt.destruct -#endif - ) { -FF_ENABLE_DEPRECATION_WARNINGS + if (ret == 0 && new_pkt.data != pkt->data) { if ((ret = av_copy_packet(&new_pkt, pkt)) < 0) break; ret = 1; |