Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev