Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'
[ffmpeg.git] / ffmpeg_vdpau.c
2013-11-23 Michael NiedermayerMerge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'