diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-25 03:54:43 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-25 04:04:55 +0300 |
| commit | 46a60fe184cfd39cc9517c860c7404d60977456d (patch) | |
| tree | defea2eafea18157f2ea1c217765c749524720f0 /libavformat/internal.h | |
| parent | f573acc4244769c294d45df9e7dc47d9d8cfb8b7 (diff) | |
avformat: Fix ff_interleaved_peek()
Fixes assertion failures in movenc
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 6b7f677950..8c2740be2e 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -625,9 +625,11 @@ int ff_bprint_to_codecpar_extradata(AVCodecParameters *par, struct AVBPrint *buf * The packet is not removed from the interleaving queue, but only * a pointer to it is returned. * + * @param ts_offset the ts difference between packet in the que and the muxer. + * * @return a pointer to the next packet, or NULL if no packet is queued * for this stream. */ -const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream); +const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream, int64_t *ts_offset); #endif /* AVFORMAT_INTERNAL_H */ |