[FFmpeg-cvslog] Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 15 13:01:32 2014 +0100| [228fded03622f9b14df7fca45ef6fab089582c08] | committer: Michael Niedermayer

Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'

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

Conflicts:
	libavcodec/vaapi.c

See: f2118d44c9f18b3245bec2415c563d94201dcf5a
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=228fded03622f9b14df7fca45ef6fab089582c08
---