[FFmpeg-cvslog] Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 22:38:11 2014 +0100| [4d216420bed9d02cf0989d1e986247c1cd2f36c4] | committer: Michael Niedermayer

Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'

* commit '7948a51b5c3d08e1a1173442a7ff72b220def303':
  vdpau: don't assume Picture and H264Picture are the same

Conflicts:
	libavcodec/vdpau.c

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

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