Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9'

* commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9': vdpau: add helper for surface chroma type and size Conflicts: libavcodec/vdpau.c libavcodec/version.h

Michael Niedermayer committed 11 years ago

Commit d7aaeea2 parents ddb9a24 c220a604 files · +71 −5Browse files

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

Unified · Split

doc/APIchanges+3−0

@@ -15,6 +15,9 @@ libavutil: 2014-08-09 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	201x-xx-xx - xxxxxxx - lavc 56.10.0 - vdpau.h
		19	Add av_vdpau_get_surface_parameters().
		20
18	201x-xx-xx - xxxxxxx - lavc 56.9.0 - avcodec.h	21	201x-xx-xx - xxxxxxx - lavc 56.9.0 - avcodec.h
19	Add AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH flag to av_vdpau_bind_context().	22	Add AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH flag to av_vdpau_bind_context().
20		23

Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code