Hu Chunming / FFNvDecoder

Merge branch 'dev-cmhu' of 192.168.10.182:ming/FFNvDecoder into dev-cmhu

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.