Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 12:01:32 +0000 (13:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 12:03:01 +0000 (13:03 +0100)
commit228fded03622f9b14df7fca45ef6fab089582c08
tree361b7cc9ac55f8312a3726c47b5442d4d6d2b0c3
parentd2f9b9da03626bf94dac27d471114b867bacb1ed
parentbab8d73765238bfeea7a8dfd454f40ac213b3d22
Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'

* commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22':
  vaapi: wrap codec specific functions in appropiate #ifs

Conflicts:
libavcodec/vaapi.c

See: f2118d44c9f18b3245bec2415c563d94201dcf5a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/vaapi.c