diff options
| author | Nicolas George <george@nsup.org> | 2015-11-27 18:57:27 +0100 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-12-03 19:16:12 +0100 |
| commit | 3ab1e5a48c53fdecdf50d177d20b6476094cec68 (patch) | |
| tree | 57e7b466084caf2b500ed854d5a967581e3d8239 /libavformat | |
| parent | 64f7db554ee83846f207e82a08946a6a5a6acfe2 (diff) | |
lavf: add FFERROR_REDO to let demuxers return no packet.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/internal.h | 6 | ||||
| -rw-r--r-- | libavformat/utils.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index ee860947e1..90f0a61433 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -516,4 +516,10 @@ int ff_copy_whitelists(AVFormatContext *dst, AVFormatContext *src); int ffio_open2_wrapper(struct AVFormatContext *s, AVIOContext **pb, const char *url, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options); +/** + * Returned by demuxers to indicate that data was consumed but discarded + * (ignored streams or junk data). The framework will re-call the demuxer. + */ +#define FFERROR_REDO FFERRTAG('R','E','D','O') + #endif /* AVFORMAT_INTERNAL_H */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 973256f2f2..e93a1920c9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -680,6 +680,11 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) av_init_packet(pkt); ret = s->iformat->read_packet(s, pkt); if (ret < 0) { + /* Some demuxers return FFERROR_REDO when they consume + data and discard it (ignored streams, junk, extradata). + We must re-call the demuxer to get the real packet. */ + if (ret == FFERROR_REDO) + continue; if (!pktl || ret == AVERROR(EAGAIN)) return ret; for (i = 0; i < s->nb_streams; i++) { |