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 /doc | |
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 'doc')
-rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index c4e77907bb..575a11dff5 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-xx-xx - xxxxxxx - lavc 55.57.0 - avcodec.h + Add AV_CODEC_PROP_REORDER to mark codecs supporting frame reordering. + 2014-07-27 - XXXXXXX - lavc 55.70.100 - avdct.h Add AVDCT / avcodec_dct_alloc() / avcodec_dct_init(). |