aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-10 09:08:44 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-12 08:52:59 +0200
commitaaeb37f3856ed0c29f735962b806c2e2fbfc1540 (patch)
tree9c2672b2bce84ee51060188eae50fbe922667b68
parentc19797bf59f0541d6915dab7c1568d5311757d9d (diff)
downloadffmpeg-aaeb37f3856ed0c29f735962b806c2e2fbfc1540.tar.gz
avformat/internal: Move FFERROR_REDO to demux.h
It is demuxer-only. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavformat/demux.h6
-rw-r--r--libavformat/internal.h6
-rw-r--r--libavformat/lxfdec.c1
-rw-r--r--libavformat/smacker.c1
4 files changed, 8 insertions, 6 deletions
diff --git a/libavformat/demux.h b/libavformat/demux.h
index a008c3dba1..1f57e062f6 100644
--- a/libavformat/demux.h
+++ b/libavformat/demux.h
@@ -55,6 +55,12 @@ typedef struct FFStreamInfo {
int fps_last_dts_idx;
} FFStreamInfo;
+/**
+ * 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')
+
#define RELATIVE_TS_BASE (INT64_MAX - (1LL << 48))
static av_always_inline int is_relative(int64_t ts)
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 44516578b0..5363c0c355 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -651,12 +651,6 @@ int ff_alloc_extradata(AVCodecParameters *par, int size);
*/
int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src);
-/**
- * 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')
-
/*
* A wrapper around AVFormatContext.io_close that should be used
* instead of calling the pointer directly.
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 2d0270d718..8003ae98b7 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -24,6 +24,7 @@
#include "libavutil/intreadwrite.h"
#include "libavcodec/bytestream.h"
#include "avformat.h"
+#include "demux.h"
#include "internal.h"
#define LXF_MAX_PACKET_HEADER_SIZE 256
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index eac50040d7..1d54e8e917 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -29,6 +29,7 @@
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "avio_internal.h"
+#include "demux.h"
#include "internal.h"
#define SMACKER_PAL 0x01