FFmpeg/libavcodec
Michael Niedermayer 4d216420be 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>
2014-03-20 22:39:54 +01:00
..
2014-03-16 23:31:30 +01:00
2014-03-19 22:24:32 +01:00
2014-03-16 23:29:51 +01:00
2014-03-16 23:31:29 +01:00