diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 23:49:56 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 00:37:25 +0100 |
commit | a0d0799ea2a79c6b598541248fe24083265cf336 (patch) | |
tree | 39dc8371c0962071d09fe4f6d3272d5e8063f154 /doc/APIchanges | |
parent | 53b2809f2c1b942adf4d876ac446ef97f812ac0c (diff) | |
parent | 1eec9bfc383f6dca29d83a2bfb45433dd66561c9 (diff) | |
download | ffmpeg-a0d0799ea2a79c6b598541248fe24083265cf336.tar.gz |
Merge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9'
* commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9':
APIchanges: mark the release 11 branch point
Conflicts:
doc/APIchanges
Not merged as the contents in our APIchanges differ and it could be confusing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
-rw-r--r-- | doc/APIchanges | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index df874655de..5b0e1e5824 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -75,12 +75,12 @@ API changes, most recent first: -------- 8< --------- FFmpeg 2.4 was cut here -------- 8< --------- -2014-08-28 - f30a815 / 9301486 - lavc 56.1.100 / 56.1.0 - avcodec.h - Add AV_PKT_DATA_STEREO3D to export container-level stereo3d information. - 2014-08-25 - 215db29 / b263f8f - lavf 56.3.100 / 56.3.0 - avformat.h Add AVFormatContext.max_ts_probe. +2014-08-28 - f30a815 / 9301486 - lavc 56.1.100 / 56.1.0 - avcodec.h + Add AV_PKT_DATA_STEREO3D to export container-level stereo3d information. + 2014-08-23 - 8fc9bd0 - lavu 54.7.100 - dict.h AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL arguments are now freed even on error. This is consistent with the behaviour all users |