[FFmpeg-cvslog] Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.
Alexis Ballier
git at videolan.org
Tue Aug 13 04:27:11 CEST 2013
ffmpeg | branch: master | Alexis Ballier <aballier at gentoo.org> | Mon Aug 12 19:17:55 2013 -0400| [7a48b1c49282d8386632301e77611dfbf5fd9834] | committer: Michael Niedermayer
Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a48b1c49282d8386632301e77611dfbf5fd9834
---
libavformat/avformat.h | 6 ------
libavformat/utils.c | 16 ----------------
libavformat/version.h | 3 ---
3 files changed, 25 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d5f8a29..923e253 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 8133019..dca4304 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 74eed65..8b20654 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
More information about the ffmpeg-cvslog
mailing list