RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.

This commit is contained in:
Anton Khirnov 2011-04-05 12:59:27 +02:00
parent f35ff97f2e
commit c5704b2b9a
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avformat.h
View File

@ -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); 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. * 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, void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
AVStream *st); 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, attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt,
#endif
int dump_payload); int dump_payload);
/** /**

4
libavformat/utils.c
View File

@ -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); av_hex_dump(f, pkt->data, pkt->size);
} }
#if FF_API_PKT_DUMP
void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload) void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload)
{ {
AVRational tb = { 1, AV_TIME_BASE }; AVRational tb = { 1, AV_TIME_BASE };
pkt_dump_internal(NULL, f, 0, pkt, dump_payload, tb); 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) void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload)
{ {
AVRational tb = { 1, AV_TIME_BASE }; AVRational tb = { 1, AV_TIME_BASE };
pkt_dump_internal(avcl, NULL, level, pkt, dump_payload, tb); 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

@ -101,5 +101,8 @@
#ifndef FF_API_FIND_INFO_TAG #ifndef FF_API_FIND_INFO_TAG
#define FF_API_FIND_INFO_TAG (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_FIND_INFO_TAG (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_PKT_DUMP
#define FF_API_PKT_DUMP (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif //AVFORMAT_VERSION_H #endif //AVFORMAT_VERSION_H