diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 13:31:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:52:42 +0100 |
| commit | 21824e5b88c4f5796e47847c0331bae223a21e49 (patch) | |
| tree | a13e1f7f86f8a1bf0a282118bae616c590dcd02d /libavformat | |
| parent | cc10ab79ec68697b961aebb7e1cb9eb5f529db60 (diff) | |
lavf: remove disabled FF_API_PKT_DUMP cruft
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 7 | ||||
| -rw-r--r-- | libavformat/utils.c | 16 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 26 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index cbb139feca..fe2b0cfdb7 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1195,13 +1195,6 @@ AVProgram *av_new_program(AVFormatContext *s, int id); attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename); #endif -#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 - - /** * @addtogroup lavf_decoding * @{ diff --git a/libavformat/utils.c b/libavformat/utils.c index 185418f53d..d241200d81 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3493,27 +3493,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 7696cd64a5..097fdaa427 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ * Those FF_API_* defines are not part of public API. * They 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_GUESS_IMG2_CODEC #define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54) #endif |