Changes from #x264dev review.