diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:14:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:24:11 +0200 |
| commit | f276a490f01bd31b3c9b6111867745e72da7e59d (patch) | |
| tree | 26979a20f820b8d32a9f5a00b7dfea500205d148 /libavcodec | |
| parent | d214e5cfb414ea2b8cbcf3c4300288b130388d4a (diff) | |
| parent | 3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b (diff) | |
| download | ffmpeg-f276a490f01bd31b3c9b6111867745e72da7e59d.tar.gz | |
Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'
* commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b':
avformat: fix typo in avformat_close_input
mp3enc: write Xing TOC
mp3enc: support MPEG-2 and MPEG-2.5 in Xing header.
mp3enc: downgrade some errors in writing Xing frame to warnings
lavf: flush the output AVIOContext in av_write_trailer().
lavf: cosmetics, reformat av_write_trailer().
avio: flush the internal buffer in avio_close()
Enhance doc on asyncts audiofilter
cmdutils: avoid setting data pointers to invalid values in alloc_buffer()
libavcodec: remove av_destruct_packet_nofree()
Conflicts:
libavcodec/avpacket.c
libavformat/mp3enc.c
libavformat/nutenc.c
libavformat/utils.c
libavformat/version.h
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/avpacket.c | 11 |
2 files changed, 1 insertions, 15 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8e3eaecd16..62a261a5da 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3619,11 +3619,6 @@ void avsubtitle_free(AVSubtitle *sub); */ /** - * @deprecated use NULL instead - */ -attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt); - -/** * Default packet destructor. */ void av_destruct_packet(AVPacket *pkt); diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index b0c734dcc7..dbbba56ca7 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -27,14 +27,6 @@ #include "bytestream.h" #include "internal.h" -void av_destruct_packet_nofree(AVPacket *pkt) -{ - pkt->data = NULL; - pkt->size = 0; - pkt->side_data = NULL; - pkt->side_data_elems = 0; -} - void ff_packet_free_side_data(AVPacket *pkt) { int i; @@ -137,8 +129,7 @@ int av_dup_packet(AVPacket *pkt) { AVPacket tmp_pkt; - if (((pkt->destruct == av_destruct_packet_nofree) || - (pkt->destruct == NULL)) && pkt->data) { + if (pkt->destruct == NULL && pkt->data) { tmp_pkt = *pkt; pkt->data = NULL; |