diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 01:50:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 01:50:26 +0100 |
| commit | f4c8d002231afbc181e97c512e459ec6860f7098 (patch) | |
| tree | 1e54b1287f49f89e3156284c40b5b87365c9a10a /doc | |
| parent | ca9f7e1832785414362bb8aeef1c7eb0a454d92e (diff) | |
| parent | 6bb8720f00e2e6209665f819fb351fd42b82d5d0 (diff) | |
Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0':
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
Conflicts:
doc/APIchanges
libavutil/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 047b9bdc37..432acdc009 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-xx-xx - xxxxxxx - lavu 53.03.01 - opt.h + Deprecate unused AV_OPT_FLAG_METADATA. + 2014-02-xx - xxxxxxx - lavd 55.10.100 - avdevice.h Add avdevice_list_devices() and avdevice_free_list_devices() |