(cherry picked from commit e7eb250a251766658a3ac5d8d8e7da9a3d792b4f)

Conflicts:
	modules/codec/Modules.am
	modules/codec/avcodec/avcodec.c
	modules/codec/avcodec/dxva2.c
	modules/codec/avcodec/va.h
	modules/codec/avcodec/vaapi.c
	modules/codec/avcodec/vda.c
	modules/codec/avcodec/video.c