diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:41:41 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:41:41 +0200 |
commit | cac07d0e103656a2436ea04b700128ce436a4d06 (patch) | |
tree | 26ad63f72adfeb90f1f5857cb5c458cdd2d77ff1 /doc | |
parent | b7dd250b7545ece973bd4c92fd7f93ce042fa911 (diff) | |
parent | 5fccedaa67390ccddd6347c8e1c71b7664558bcd (diff) | |
download | ffmpeg-cac07d0e103656a2436ea04b700128ce436a4d06.tar.gz |
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/APIchanges | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index a35501a2bd..21c7d92657 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-04-xx - xxxxxxx - avcodec.h + Deprecate CODEC_FLAG_INPUT_PRESERVED. Its functionality is replaced by passing + reference-counted frames to encoders. + 2014-04-29 - 1bf6396 - lavc 55.60.100 - avcodec.h Add AVCodecDescriptor.mime_types field. |