diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-23 20:48:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-23 20:48:54 +0200 |
| commit | d062db788012b94e899008964b93cf01a8389fec (patch) | |
| tree | 1cf04c15dfd9eea127b543bd12bae021a5e789cd /doc | |
| parent | 4e4dbb99831d97d0716a3ec048278ddd75205b5a (diff) | |
| parent | 21f68c2489cba2a1a4a41d0c5c828266e6162800 (diff) | |
| download | ffmpeg-d062db788012b94e899008964b93cf01a8389fec.tar.gz | |
Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'
* commit '21f68c2489cba2a1a4a41d0c5c828266e6162800':
avcodec: bump version after rotation api
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 6bc4ac51e4..d44b46b546 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -26,7 +26,7 @@ API changes, most recent first: Add AV_FRAME_DATA_DISPLAYMATRIX for exporting frame-level spatial rendering on video frames for proper display. -2014-05-xx - xxxxxxx - lavc 55.52.0 - avcodec.h +2014-05-xx - xxxxxxx - lavc 55.64.100 / 55.53.0 - avcodec.h Add AV_PKT_DATA_DISPLAYMATRIX for exporting packet-level spatial rendering on video frames for proper display. |