Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2016-06-24 23:38:54 +0300
committerMartin Storsjö <martin@martin.st>2016-06-28 14:16:06 +0300
commit785c25443b56adb6dbbb78d68cccbd9bd4a42e05 (patch)
tree91dc6842332b80b09e902ce212c4c608500f3eb7 /libavformat/internal.h
parenteccfb9778ae939764d17457f34338d140832d9e1 (diff)
movenc: Apply offsets on timestamps when peeking into interleaving queues
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/internal.h')
-rw-r--r--libavformat/internal.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h
index bbdfd2f719..de55af5af4 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -443,12 +443,13 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb);
/**
* Find the next packet in the interleaving queue for the given stream.
- * The packet is not removed from the interleaving queue, but only
- * a pointer to it is returned.
+ * The pkt parameter is filled in with the queued packet, including
+ * references to the data (which the caller is not allowed to keep or
+ * modify).
*
- * @return a pointer to the next packet, or NULL if no packet is queued
- * for this stream.
+ * @return 0 if a packet was found, a negative value if no packet was found
*/
-const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream);
+int ff_interleaved_peek(AVFormatContext *s, int stream,
+ AVPacket *pkt, int add_offset);
#endif /* AVFORMAT_INTERNAL_H */