diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 14:37:48 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 14:37:48 +0100 |
| commit | 611c22140a54db0baa863b26368e12d3a1d8267e (patch) | |
| tree | 559b65b68d30e12abfb199277b6119c58df81627 /libavformat/internal.h | |
| parent | c03ffe1712e65b2f18d090d34db95ef18340bd0e (diff) | |
| parent | 8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8 (diff) | |
| download | ffmpeg-611c22140a54db0baa863b26368e12d3a1d8267e.tar.gz | |
Merge commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8'
* commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8':
lavf: deprecate compute_pkt_fields2
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 1533722e8f..acfee94d8a 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -110,11 +110,23 @@ struct AVFormatInternal { */ AVRational offset_timebase; +#if FF_API_COMPUTE_PKT_FIELDS2 + int missing_ts_warning; +#endif + int inject_global_side_data; int avoid_negative_ts_use_pts; }; +struct AVStreamInternal { + /** + * Set to 1 if the codec allows reordering, so pts can be different + * from dts. + */ + int reorder; +}; + #ifdef __GNUC__ #define dynarray_add(tab, nb_ptr, elem)\ do {\ |