diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 00:20:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 00:20:48 +0200 |
| commit | d858ee717bed6307b8e772bd5039ab001aeae03f (patch) | |
| tree | 2e8d510d7c759cf58cb178c55409340bab048161 /libavformat/avformat.h | |
| parent | b50559fc0b2bb4c1ac85aad2e9b0122fe4ec53a3 (diff) | |
| parent | 6d212599aa684f30511fb08ca30fe2378405304e (diff) | |
Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'
* commit '6d212599aa684f30511fb08ca30fe2378405304e':
avformat: Provide a standard compliance flag
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 2103f50e57..01c3b75c37 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1424,6 +1424,12 @@ typedef struct AVFormatContext { int64_t max_interleave_delta; /** + * Allow non-standard and experimental extension + * @see AVCodecContext.strict_std_compliance + */ + int strict_std_compliance; + + /** * Transport stream id. * This will be moved into demuxer private options. Thus no API/ABI compatibility */ |