Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65': lavc: make error_rate a private option of mpegvideo encoders Conflicts: libavcodec/options_table.h libavcodec/version.h

Michael Niedermayer committed 13 years ago

Commit b71e4d82 parents 31c09b7 89419716 files · +29 −7Browse files

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

Unified · Split

doc/APIchanges+4−0

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2013-10-xx - xxxxxxx - lavc 55.27.0 - avcodec.h
		19	Deprecate AVCodecContext.error_rate, it is replaced by the 'error_rate'
		20	private option of the mpegvideo encoder family.
		21
18	2013-11-xx - xxxxxxx - lavc 55.26.0 - vdpau.h	22	2013-11-xx - xxxxxxx - lavc 55.26.0 - vdpau.h
19	Add av_vdpau_get_profile().	23	Add av_vdpau_get_profile().
20	Add av_vdpau_alloc_context(). This function must from now on be	24	Add av_vdpau_alloc_context(). This function must from now on be

Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code