Fix encoding of H264
Merge branch 'h261' into h261-performance