[FFmpeg-cvslog] Merge commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 12:32:07 2014 +0200| [10b6d7462cbf0d13913c9d07e85c79210427d71e] | committer: Michael Niedermayer

Merge commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd'

* commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd':
  vdpau: common support for managing the VdpDecoder in avcodec

Conflicts:
	libavcodec/vdpau.c

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

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