Michael Niedermayer 19139d8516 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame

Conflicts:
	libavcodec/vaapi.c
	libavcodec/vaapi_internal.h

See: 377cfc28a2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-20 23:08:58 +01:00

2.3 KiB

Raw Blame History

View Raw