summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-03-15 13:37:43 +0100
committerAnton Khirnov <anton@khirnov.net>2012-03-20 20:12:16 +0100
commita6733202cc6891f9feec48e33e342e657da3873d (patch)
tree3b40a1a2ec6996215dd6face613f7b217ea1faa5 /libavformat/avformat.h
parent3c90cc2ef21a928a7c11cf5a4583169025cdf847 (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/avformat.h')
-rw-r--r--libavformat/avformat.h18
1 files changed, 5 insertions, 13 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4272a4f91f..073ca67afc 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1374,23 +1374,15 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
*/
int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
+#if FF_API_INTERLEAVE_PACKET
/**
- * Interleave a packet per dts in an output media file.
- *
- * Packets with pkt->destruct == av_destruct_packet will be freed inside this
- * function, so they cannot be used after it. Note that calling av_free_packet()
- * on them is still safe.
- *
- * @param s media file handle
- * @param out the interleaved packet will be output here
- * @param pkt the input packet
- * @param flush 1 if no further packets are available as input and all
- * remaining packets should be output
- * @return 1 if a packet was output, 0 if no packet could be output,
- * < 0 if an error occurred
+ * @deprecated this function was never meant to be called by the user
+ * programs.
*/
+attribute_deprecated
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
AVPacket *pkt, int flush);
+#endif
/**
* Write the stream trailer to an output media file and free the