generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Alexis Ballier 2013-08-12 19:17:55 -04:00 committed by Michael Niedermayer
parent ca2378ad04
commit 7a48b1c492
3 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@ -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 #if FF_API_ALLOC_OUTPUT_CONTEXT
/** /**
* @deprecated deprecated in favor of avformat_alloc_output_context2() * @deprecated deprecated in favor of avformat_alloc_output_context2()

16
libavformat/utils.c
View File

@ -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); 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) 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); 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, void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
AVStream *st) AVStream *st)
{ {

3
libavformat/version.h
View File

@ -49,9 +49,6 @@
* the public API and may change, break or disappear at any time. * 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 #ifndef FF_API_ALLOC_OUTPUT_CONTEXT
#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56) #define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif #endif