diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-05 12:59:27 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-08 15:44:09 +0200 |
| commit | c5704b2b9a9cb38e27d24f9962594def16870c52 (patch) | |
| tree | 4502e670b885d32fe5376811e94c16bdf9968c44 /libavformat | |
| parent | f35ff97f2e572a6b02180b248f929541962ffdd3 (diff) | |
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 61babdcb04..6b1b2b493d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -978,7 +978,6 @@ void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size); */ void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st); -attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload); /** * Send a nice dump of a packet to the log. @@ -994,7 +993,10 @@ attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload); void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload, AVStream *st); +#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, +#endif int dump_payload); /** diff --git a/libavformat/utils.c b/libavformat/utils.c index da8f3fd3bd..ca582b34df 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3545,22 +3545,26 @@ 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 58ef4b846f..512195e82f 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -101,5 +101,8 @@ #ifndef FF_API_FIND_INFO_TAG #define FF_API_FIND_INFO_TAG (LIBAVFORMAT_VERSION_MAJOR < 54) #endif +#ifndef FF_API_PKT_DUMP +#define FF_API_PKT_DUMP (LIBAVFORMAT_VERSION_MAJOR < 54) +#endif #endif //AVFORMAT_VERSION_H |