[FFmpeg-cvslog] Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 15 12:30:07 2014 +0200| [51c810e62b63a1451b337b1cba0141b386066668] | committer: Michael Niedermayer

Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'

* commit 'd565fef1b83b6c5f8afb32229260b79f67c68109':
  vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check

Conflicts:
	libavcodec/version.h

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

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