Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'

* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0': AVOptions: deprecate unused AV_OPT_FLAG_METADATA Conflicts: doc/APIchanges libavutil/version.h

Michael Niedermayer committed 12 years ago

Commit f4c8d002 parents ca9f7e1 6bb87203 files · +9 −1Browse files

Showing the changes to doc/APIchanges (1 of 3 files). Show all

Unified · Split

@@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2014-xx-xx - xxxxxxx - lavu 53.03.01 - opt.h
		19	Deprecate unused AV_OPT_FLAG_METADATA.
		20
18	2014-02-xx - xxxxxxx - lavd 55.10.100 - avdevice.h	21	2014-02-xx - xxxxxxx - lavd 55.10.100 - avdevice.h
19	Add avdevice_list_devices() and avdevice_free_list_devices()	22	Add avdevice_list_devices() and avdevice_free_list_devices()
20		23

Keyboard shortcuts