diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-03-15 16:37:43 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-03-20 23:12:16 +0400 |
commit | a6733202cc6891f9feec48e33e342e657da3873d (patch) | |
tree | 3b40a1a2ec6996215dd6face613f7b217ea1faa5 /libavformat/utils.c | |
parent | 3c90cc2ef21a928a7c11cf5a4583169025cdf847 (diff) |
lavf: make av_interleave_packet_per_dts() private.
There is no reason for it to be public, it's only meant to be used
internally.
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 4b302a9531..6c985af1a0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3068,7 +3068,9 @@ static int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacke return comp > 0; } -int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){ +int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, + AVPacket *pkt, int flush) +{ AVPacketList *pktl; int stream_count=0; int i; @@ -3098,6 +3100,14 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pk } } +#if FF_API_INTERLEAVE_PACKET +int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, + AVPacket *pkt, int flush) +{ + return ff_interleave_packet_per_dts(s, out, pkt, flush); +} +#endif + /** * Interleave an AVPacket correctly so it can be muxed. * @param out the interleaved packet will be output here @@ -3114,7 +3124,7 @@ static int interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *in, in av_free_packet(in); return ret; } else - return av_interleave_packet_per_dts(s, out, in, flush); + return ff_interleave_packet_per_dts(s, out, in, flush); } int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt){ |