Merge "Fix both H.263 and MPEG4 decoders." into jb-dev