RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/internal: Move FFERROR_REDO to demux.h 

It is demuxer-only.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-05-10 09:08:44 +02:00
parent c19797bf59
commit aaeb37f385
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/demux.h
View File

@ -55,6 +55,12 @@ typedef struct FFStreamInfo {
int fps_last_dts_idx; int fps_last_dts_idx;
} FFStreamInfo; } 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)) #define RELATIVE_TS_BASE (INT64_MAX - (1LL << 48))
static av_always_inline int is_relative(int64_t ts) static av_always_inline int is_relative(int64_t ts)

6
libavformat/internal.h
View File

@ -651,12 +651,6 @@ int ff_alloc_extradata(AVCodecParameters *par, int size);
*/ */
int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src); 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 * A wrapper around AVFormatContext.io_close that should be used
* instead of calling the pointer directly. * instead of calling the pointer directly.

1
libavformat/lxfdec.c
View File

@ -24,6 +24,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "avformat.h" #include "avformat.h"
#include "demux.h"
#include "internal.h" #include "internal.h"
#define LXF_MAX_PACKET_HEADER_SIZE 256 #define LXF_MAX_PACKET_HEADER_SIZE 256

1
libavformat/smacker.c
View File

@ -29,6 +29,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "demux.h"
#include "internal.h" #include "internal.h"
#define SMACKER_PAL 0x01 #define SMACKER_PAL 0x01