am 9696359c: am 61473913: (-s ours) am d199a019: am ff30d69c: Merge "h263_enc: Add test"

* commit '9696359c0595f293ade5cecd541c3d84ff109b2b':