diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2013-08-12 19:17:55 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-13 04:18:32 +0200 |
| commit | 7a48b1c49282d8386632301e77611dfbf5fd9834 (patch) | |
| tree | da6f415fa88ffda09128af7dcd942e32c67d4562 | |
| parent | ca2378ad04e101b57017df9129fffef928d246cf (diff) | |
| download | ffmpeg-7a48b1c49282d8386632301e77611dfbf5fd9834.tar.gz | |
Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avformat.h | 6 | ||||
| -rw-r--r-- | libavformat/utils.c | 16 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 25 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d5f8a29869..923e253f60 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1423,12 +1423,6 @@ AVProgram *av_new_program(AVFormatContext *s, int id); */ -#if FF_API_PKT_DUMP -attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload); -attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, - int dump_payload); -#endif - #if FF_API_ALLOC_OUTPUT_CONTEXT /** * @deprecated deprecated in favor of avformat_alloc_output_context2() diff --git a/libavformat/utils.c b/libavformat/utils.c index 8133019e8b..dca4304963 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3709,27 +3709,11 @@ static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int av_hex_dump(f, pkt->data, pkt->size); } -#if FF_API_PKT_DUMP -void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload) -{ - AVRational tb = { 1, AV_TIME_BASE }; - pkt_dump_internal(NULL, f, 0, pkt, dump_payload, tb); -} -#endif - void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st) { pkt_dump_internal(NULL, f, 0, pkt, dump_payload, st->time_base); } -#if FF_API_PKT_DUMP -void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload) -{ - AVRational tb = { 1, AV_TIME_BASE }; - pkt_dump_internal(avcl, NULL, level, pkt, dump_payload, tb); -} -#endif - void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload, AVStream *st) { diff --git a/libavformat/version.h b/libavformat/version.h index 74eed65015..8b206546a7 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -49,9 +49,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_PKT_DUMP -#define FF_API_PKT_DUMP (LIBAVFORMAT_VERSION_MAJOR < 54) -#endif #ifndef FF_API_ALLOC_OUTPUT_CONTEXT #define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56) #endif |