Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 21:38:11 +0000 (22:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 21:39:54 +0000 (22:39 +0100)
commit4d216420bed9d02cf0989d1e986247c1cd2f36c4
tree9d5316d57b022fea0185f1c17eaa217a82fb51dd
parente98bac82e5152f492ef05deff562abb2c68ec2ca
parent7948a51b5c3d08e1a1173442a7ff72b220def303
Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'

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

Conflicts:
libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vdpau.c
libavcodec/vdpau_h264.c
libavcodec/vdpau_internal.h
libavcodec/vdpau_mpeg12.c
libavcodec/vdpau_mpeg4.c
libavcodec/vdpau_vc1.c