diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 00:55:34 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 00:57:02 +0300 |
| commit | 8fad4b4e251bb21f8871fa829b593454528aff24 (patch) | |
| tree | bda5790e6959ca5d64963800e06c4fb2de6accb3 /libavformat/internal.h | |
| parent | fb40daa7f3b86b66b15973d33f4269461b1e1ffd (diff) | |
| parent | 785c25443b56adb6dbbb78d68cccbd9bd4a42e05 (diff) | |
Merge commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05'
* commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05':
movenc: Apply offsets on timestamps when peeking into interleaving queues
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index da64c641a7..9d614fb12c 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -657,14 +657,13 @@ int ff_bprint_to_codecpar_extradata(AVCodecParameters *par, struct AVBPrint *buf /** * 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). * - * @param ts_offset the ts difference between packet in the queue and the muxer. - * - * @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, int64_t *ts_offset); +int ff_interleaved_peek(AVFormatContext *s, int stream, + AVPacket *pkt, int add_offset); #endif /* AVFORMAT_INTERNAL_H */ |