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

lavf: remove disabled FF_API_PKT_DUMP cruft

Browse Source
This commit is contained in:
Anton Khirnov 2012-01-12 13:31:55 +01:00
parent cc10ab79ec
commit 21824e5b88
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/avformat.h
View File

@ -1195,13 +1195,6 @@ AVProgram *av_new_program(AVFormatContext *s, int id);
attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename); attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename);
#endif #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 * @addtogroup lavf_decoding
* @{ * @{

16
libavformat/utils.c
View File

@ -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); 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

@ -47,9 +47,6 @@
* Those FF_API_* defines are not part of public API. * Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time. * 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 #ifndef FF_API_GUESS_IMG2_CODEC
#define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif