diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 12:36:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 12:36:28 +0200 |
| commit | 2e5c8b06491b3713405421e1dcbcdf9bb1e7dfea (patch) | |
| tree | 2e4398236ebcf49b0315791e97ff01e55d89567c /libavcodec/avcodec.h | |
| parent | 5003b8b9c3bacc4e542c923a7766c2ff46e0b1e8 (diff) | |
| parent | c5fca0174db9ed45be821177f49bd9633152704d (diff) | |
Merge commit 'c5fca0174db9ed45be821177f49bd9633152704d'
* commit 'c5fca0174db9ed45be821177f49bd9633152704d':
lavc: add a property for marking codecs that support frame reordering
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ba1873137d..edd918cd3d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -596,6 +596,16 @@ typedef struct AVCodecDescriptor { */ #define AV_CODEC_PROP_LOSSLESS (1 << 2) /** + * Codec supports frame reordering. That is, the coded order (the order in which + * the encoded packets are output by the encoders / stored / input to the + * decoders) may be different from the presentation order of the corresponding + * frames. + * + * For codecs that do not have this property set, PTS and DTS should always be + * equal. + */ +#define AV_CODEC_PROP_REORDER (1 << 3) +/** * Subtitle codec is bitmap based * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field. */ |