diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-21 23:53:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-21 23:53:39 +0200 |
| commit | 938adb7abcfb38ab8287e97847010479a116f78c (patch) | |
| tree | 36d0bee76f90de3f425df905f603f6875d969cbb /libavformat/avformat.h | |
| parent | faa2930f191099621e03c55cca32662467d3cc15 (diff) | |
| parent | 13a867a63e64c62a41b7aa31bc61ca91a5eb1cf6 (diff) | |
| download | ffmpeg-938adb7abcfb38ab8287e97847010479a116f78c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dwt: K&R prettyprinting cosmetics
Remove libnut wrapper
fate: change name of FATE samples location environment variable
avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
http: Factorize the code by adding http_read_header()
Conflicts:
configure
doc/APIchanges
doc/fate.texi
libavcodec/dwt.c
libavcodec/dwt.h
libavformat/Makefile
libavformat/avformat.h
libavformat/libnut.c
libavformat/matroskaenc.c
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8198793ca8..c5d6f5d1f7 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -351,10 +351,16 @@ typedef struct AVProbeData { #define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */ #define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */ #define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */ +#if LIBAVFORMAT_VERSION_MAJOR <= 54 +#define AVFMT_TS_NONSTRICT 0x8020000 //we try to be compatible to the ABIs of ffmpeg and major forks +#else +#define AVFMT_TS_NONSTRICT 0x20000 +#endif + /**< Format does not require strictly + increasing timestamps, but they must + still be monotonic */ + #define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */ -#define AVFMT_TS_NONSTRICT 0x8000000 /**< Format does not require strictly - increasing timestamps, but they must - still be monotonic */ /** * @addtogroup lavf_encoding @@ -377,7 +383,8 @@ typedef struct AVOutputFormat { /** * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE, * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, - * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH + * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH, + * AVFMT_TS_NONSTRICT */ int flags; |