[FFmpeg-cvslog] Merge commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 17 23:57:50 2015 +0100| [0d801c0bfdecd721c48f6665f7d0d80930c46f71] | committer: Michael Niedermayer

Merge commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf' into release/2.4

* commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf':
  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=0d801c0bfdecd721c48f6665f7d0d80930c46f71
---